--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -18,14 +18,12 @@
 	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
 	-DGVFS_LOCALEDIR=\""$(localedir)"\"
 
-privlibdir = $(libdir)/gvfs
-
-privlib_LTLIBRARIES=libgvfsdaemon.la
+noinst_LTLIBRARIES=libdaemon.la
 
 libraries =						\
-	libgvfsdaemon.la				\
+	libdaemon.la					\
 	$(top_builddir)/common/libgvfscommon.la		\
-	$(GLIB_LIBS) $(DBUS_LIBS)
+	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
 
 gvfs_gschemas =
 gvfs_gschemas_convert =
@@ -134,7 +132,7 @@
 	gvfsd-test			\
 	$(NULL)
 
-libgvfsdaemon_la_SOURCES = \
+libdaemon_la_SOURCES = \
 	gvfsdaemon.c gvfsdaemon.h \
 	gvfsbackend.c gvfsbackend.h \
 	gvfschannel.c gvfschannel.h \
@@ -182,12 +180,6 @@
 	gvfskeyring.h gvfskeyring.c \
         $(NULL)
 
-libgvfsdaemon_la_LDFLAGS = -avoid-version
-
-libgvfsdaemon_la_LIBADD = \
-	$(top_builddir)/common/libgvfscommon.la		\
-	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
-
 gvfsd_SOURCES = \
 	mount.c mount.h \
 	main.c
--- a/debian/gvfs-libs.install
+++ b/debian/gvfs-libs.install
@@ -1,2 +1 @@
-usr/lib/*/gvfs/libgvfsdaemon.so
 usr/lib/*/gvfs/libgvfscommon.so