--- Makefile.am.ori	2013-03-09 16:41:33.177265400 +0100
+++ Makefile.am.ori	2013-03-09 16:42:25.338609643 +0100
@@ -912,7 +912,6 @@ 
 	libsystemd-dbus.la \
 	libsystemd-audit.la \
 	libsystemd-id128-internal.la \
-	libsystemd-daemon.la \
 	libudev.la \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
@@ -964,7 +963,6 @@ 
 
 systemd_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la \
 	libsystemd-id128-internal.la \
 	libsystemd-dbus.la
 
@@ -1060,7 +1058,6 @@ 
 
 test_engine_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la
 
 test_job_type_SOURCES = \
@@ -1071,8 +1068,7 @@ 
 	$(DBUS_CFLAGS)
 
 test_job_type_LDADD = \
-	libsystemd-core.la \
-	libsystemd-daemon.la
+	libsystemd-core.la
 
 test_ns_SOURCES = \
 	src/test/test-ns.c
@@ -1173,8 +1169,7 @@ 
 	src/test/test-daemon.c
 
 test_daemon_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-shared.la
 
 test_cgroup_SOURCES = \
 	src/test/test-cgroup.c
@@ -1243,8 +1238,7 @@ 
 	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
 
 test_sched_prio_LDADD = \
-	libsystemd-core.la \
-	libsystemd-daemon.la
+	libsystemd-core.la
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
@@ -1256,7 +1250,6 @@ 
 
 systemd_initctl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la
 
 # ------------------------------------------------------------------------------
@@ -1279,8 +1272,7 @@ 
 
 systemd_shutdownd_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-shared.la
 
 pkginclude_HEADERS += \
 	src/systemd/sd-shutdown.h
@@ -1491,7 +1483,6 @@ 
 	libsystemd-units.la \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la \
 	libsystemd-logs.la
 
@@ -1501,8 +1492,7 @@ 
 	src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
@@ -1545,7 +1535,6 @@ 
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
@@ -1593,8 +1582,7 @@ 
 INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
 UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
 
-lib_LTLIBRARIES += \
-	libsystemd-daemon.la
+lib_LTLIBRARIES += 
 
 noinst_LTLIBRARIES += \
         libsystemd-daemon-internal.la
@@ -2331,8 +2319,7 @@ 
 	src/activate/activate.c
 
 systemd_activate_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
@@ -2505,7 +2492,6 @@ 
 libsystemd_journal_internal_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-audit.la \
-	libsystemd-daemon.la \
 	libudev.la \
 	libsystemd-shared.la \
 	libsystemd-label.la
@@ -2677,7 +2663,6 @@ 
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
-	libsystemd-daemon.la \
 	$(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
@@ -2804,7 +2789,6 @@ 
 
 systemd_readahead_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libudev.la
 
 dist_doc_DATA += \
@@ -2944,7 +2928,6 @@ 
 systemd_hostnamed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
@@ -3011,7 +2994,6 @@ 
 systemd_localed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la
 
 nodist_systemunit_DATA += \
@@ -3087,7 +3069,6 @@ 
 systemd_timedated_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la
 
 rootlibexec_PROGRAMS += \
@@ -3155,8 +3136,7 @@ 
 
 bootctl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-id128.la \
-	libsystemd-daemon.la
+	libsystemd-id128.la
 
 bin_PROGRAMS += \
 	bootctl
@@ -3220,7 +3200,6 @@ 
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
-	libsystemd-daemon.la \
 	libsystemd-dbus.la \
 	libudev.la
 
@@ -3334,7 +3313,6 @@ 
 	-export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-	libsystemd-daemon.la \
 	libsystemd-audit.la \
 	libsystemd-dbus.la \
 	libsystemd-shared.la \