diff --git a/daemon/qemud.c b/daemon/qemud.c
index 1d163c902e..7cd190f368 100644
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -92,7 +92,7 @@
 #ifdef WITH_NODE_DEVICES
 #include "node_device/node_device_driver.h"
 #endif
-#include "secret_driver.h"
+#include "secret/secret_driver.h"
 #endif
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index caae3a068c..87785925e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,7 +183,7 @@ INTERFACE_DRIVER_SOURCES =					\
 		interface/netcf_driver.h interface/netcf_driver.c
 
 SECRET_DRIVER_SOURCES =						\
-		secret_driver.h secret_driver.c
+		secret/secret_driver.h secret/secret_driver.c
 
 # Storage backend specific impls
 STORAGE_DRIVER_SOURCES =					\
diff --git a/src/secret_driver.c b/src/secret/secret_driver.c
similarity index 100%
rename from src/secret_driver.c
rename to src/secret/secret_driver.c
diff --git a/src/secret_driver.h b/src/secret/secret_driver.h
similarity index 100%
rename from src/secret_driver.h
rename to src/secret/secret_driver.h