diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc
index 87518f9d..93db6de4 100644
--- a/systemd-mini-rpmlintrc
+++ b/systemd-mini-rpmlintrc
@@ -1,20 +1,20 @@
 addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*")
 addFilter(".*dangling-symlink .* /dev/null.*")
-addFilter(".*files-duplicate .*/reboot.8.*")
-addFilter(".*files-duplicate .*/sd_is_socket.3.*")
-addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion.sh")
-addFilter("non-conffile-in-etc /etc/rpm/macros.systemd")
+addFilter(".*files-duplicate .*/reboot\.8.*")
+addFilter(".*files-duplicate .*/sd_is_socket\.3.*")
+addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh")
+addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd")
 addFilter(".*dbus-policy-allow-receive")
 addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*")
 addFilter(".*dangling-symlink /lib/udev/devices/core.*")
 addFilter(".*dangling-symlink /lib/udev/devices/fd.*")
-addFilter(".*incoherent-init-script-name boot.udev.*")
-addFilter(".init-script-without-%stop_on_removal-preun /etc/init.d/boot.udev")
-addFilter(".init-script-without-%restart_on_update-postun /etc/init.d/boot.udev")
+addFilter(".*incoherent-init-script-name boot\.udev.*")
+addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev")
+addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev")
 addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
 addFilter(".*libgudev-.*shlib-fixed-dependency.*")
 addFilter(".*suse-filelist-forbidden-systemd-userdirs.*")
 addFilter("libudev-mini.*shlib-policy-name-error.*")
 addFilter("nss-myhostname.*shlib-policy-name-error.*")
 addFilter("systemd-logger.*useless-provides sysvinit(syslog).*")
-
+addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*")
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 251bb0c4..cd35829a 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 21 08:33:34 UTC 2014 - werner@suse.de
+
+- Move systemd.pc and udev.pc to their main packages (bnc#876587)
+
 -------------------------------------------------------------------
 Tue May 20 12:13:05 UTC 2014 - werner@suse.de
 
@@ -34,7 +39,8 @@ Tue May 20 11:03:54 UTC 2014 - werner@suse.de
 -------------------------------------------------------------------
 Mon May 19 13:21:18 UTC 2014 - werner@suse.de
 
-- Add upstream patches mainly for better lid handling 
+- Add upstream patches mainly for better lid handling (bnc#878525
+  and bnc#868019)
   0001-logind-ignore-lid-switch-if-more-than-1-display-is-c.patch
   0002-logind-fix-printf-format.patch
   0003-logind-ignore-lid-switch-events-for-30s-after-each-s.patch
diff --git a/systemd-mini.spec b/systemd-mini.spec
index e14474a5..ae276b38 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1593,6 +1593,10 @@ exit 0
 %{_datadir}/bash-completion/completions/*
 %endif
 
+%if 0%{?suse_version} > 1310
+%{_datadir}/pkgconfig/systemd.pc
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsystemd.so
@@ -1607,7 +1611,9 @@ exit 0
 %{_includedir}/systemd/sd-journal.h
 %{_includedir}/systemd/sd-messages.h
 %{_includedir}/systemd/_sd-common.h
+%if 0%{?suse_version} <= 1310
 %{_datadir}/pkgconfig/systemd.pc
+%endif
 %{_libdir}/pkgconfig/libsystemd.pc
 %{_libdir}/pkgconfig/libsystemd-daemon.pc
 %{_libdir}/pkgconfig/libsystemd-login.pc
@@ -1681,6 +1687,9 @@ exit 0
 %dir %{_prefix}/lib/systemd/network
 %{_prefix}/lib/systemd/network/*.link
 %{_prefix}/lib/systemd/network/*.network
+%if 0%{?suse_version} > 1310
+%{_datadir}/pkgconfig/udev.pc
+%endif
 
 %files -n lib%{udevpkgname}%{udev_major}
 %defattr(-,root,root)
@@ -1690,7 +1699,9 @@ exit 0
 %defattr(-,root,root)
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
+%if 0%{?suse_version} <= 1310
 %{_datadir}/pkgconfig/udev.pc
+%endif
 %{_libdir}/pkgconfig/libudev.pc
 %if ! 0%{?bootstrap}
 %dir %{_datadir}/gtk-doc
diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc
index 87518f9d..93db6de4 100644
--- a/systemd-rpmlintrc
+++ b/systemd-rpmlintrc
@@ -1,20 +1,20 @@
 addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*")
 addFilter(".*dangling-symlink .* /dev/null.*")
-addFilter(".*files-duplicate .*/reboot.8.*")
-addFilter(".*files-duplicate .*/sd_is_socket.3.*")
-addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion.sh")
-addFilter("non-conffile-in-etc /etc/rpm/macros.systemd")
+addFilter(".*files-duplicate .*/reboot\.8.*")
+addFilter(".*files-duplicate .*/sd_is_socket\.3.*")
+addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh")
+addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd")
 addFilter(".*dbus-policy-allow-receive")
 addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*")
 addFilter(".*dangling-symlink /lib/udev/devices/core.*")
 addFilter(".*dangling-symlink /lib/udev/devices/fd.*")
-addFilter(".*incoherent-init-script-name boot.udev.*")
-addFilter(".init-script-without-%stop_on_removal-preun /etc/init.d/boot.udev")
-addFilter(".init-script-without-%restart_on_update-postun /etc/init.d/boot.udev")
+addFilter(".*incoherent-init-script-name boot\.udev.*")
+addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev")
+addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev")
 addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
 addFilter(".*libgudev-.*shlib-fixed-dependency.*")
 addFilter(".*suse-filelist-forbidden-systemd-userdirs.*")
 addFilter("libudev-mini.*shlib-policy-name-error.*")
 addFilter("nss-myhostname.*shlib-policy-name-error.*")
 addFilter("systemd-logger.*useless-provides sysvinit(syslog).*")
-
+addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*")
diff --git a/systemd.changes b/systemd.changes
index 251bb0c4..cd35829a 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 21 08:33:34 UTC 2014 - werner@suse.de
+
+- Move systemd.pc and udev.pc to their main packages (bnc#876587)
+
 -------------------------------------------------------------------
 Tue May 20 12:13:05 UTC 2014 - werner@suse.de
 
@@ -34,7 +39,8 @@ Tue May 20 11:03:54 UTC 2014 - werner@suse.de
 -------------------------------------------------------------------
 Mon May 19 13:21:18 UTC 2014 - werner@suse.de
 
-- Add upstream patches mainly for better lid handling 
+- Add upstream patches mainly for better lid handling (bnc#878525
+  and bnc#868019)
   0001-logind-ignore-lid-switch-if-more-than-1-display-is-c.patch
   0002-logind-fix-printf-format.patch
   0003-logind-ignore-lid-switch-events-for-30s-after-each-s.patch
diff --git a/systemd.spec b/systemd.spec
index 074c1ea4..babbf745 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1588,6 +1588,10 @@ exit 0
 %{_datadir}/bash-completion/completions/*
 %endif
 
+%if 0%{?suse_version} > 1310
+%{_datadir}/pkgconfig/systemd.pc
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsystemd.so
@@ -1602,7 +1606,9 @@ exit 0
 %{_includedir}/systemd/sd-journal.h
 %{_includedir}/systemd/sd-messages.h
 %{_includedir}/systemd/_sd-common.h
+%if 0%{?suse_version} <= 1310
 %{_datadir}/pkgconfig/systemd.pc
+%endif
 %{_libdir}/pkgconfig/libsystemd.pc
 %{_libdir}/pkgconfig/libsystemd-daemon.pc
 %{_libdir}/pkgconfig/libsystemd-login.pc
@@ -1676,6 +1682,9 @@ exit 0
 %dir %{_prefix}/lib/systemd/network
 %{_prefix}/lib/systemd/network/*.link
 %{_prefix}/lib/systemd/network/*.network
+%if 0%{?suse_version} > 1310
+%{_datadir}/pkgconfig/udev.pc
+%endif
 
 %files -n lib%{udevpkgname}%{udev_major}
 %defattr(-,root,root)
@@ -1685,7 +1694,9 @@ exit 0
 %defattr(-,root,root)
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
+%if 0%{?suse_version} <= 1310
 %{_datadir}/pkgconfig/udev.pc
+%endif
 %{_libdir}/pkgconfig/libudev.pc
 %if ! 0%{?bootstrap}
 %dir %{_datadir}/gtk-doc