diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index ab3f238b16..958a4f600d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -110,6 +110,10 @@ endif
 if WITH_NODE_DEVICES
     libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
 endif
+
+if WITH_SECRETS
+    libvirtd_LDADD += ../src/libvirt_driver_secret.la
+endif
 endif
 
 libvirtd_LDADD += ../src/libvirt.la
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 281a46a31e..c53ef0a354 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -93,8 +93,10 @@
 #ifdef WITH_NODE_DEVICES
 #include "node_device/node_device_driver.h"
 #endif
+#ifdef WITH_SECRETS
 #include "secret/secret_driver.h"
 #endif
+#endif
 
 
 #ifdef __sun
@@ -880,7 +882,9 @@ static struct qemud_server *qemudInitialize(void) {
 #if defined(WITH_NODE_DEVICES)
     nodedevRegister();
 #endif
+#ifdef WITH_SECRETS
     secretRegister();
+#endif
 #ifdef WITH_QEMU
     qemuRegister();
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 51a40b6c61..8ef0e81880 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -598,7 +598,8 @@ if WITH_DRIVER_MODULES
 mod_LTLIBRARIES += libvirt_driver_secret.la
 else
 noinst_LTLIBRARIES += libvirt_driver_secret.la
-libvirt_la_LIBADD += libvirt_driver_secret.la
+# Stateful, so linked to daemon instead
+#libvirt_la_LIBADD += libvirt_driver_secret.la
 endif
 libvirt_driver_secret_la_CFLAGS = \
 		-I@top_srcdir@/src/conf
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cfcef44e2d..10940ebab3 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -453,8 +453,6 @@ virSecretDefParseString;
 virSecretDefParseFile;
 virSecretDefFormat;
 
-# secret_driver.h
-secretRegister;
 
 # security.h
 virSecurityDriverVerify;