diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a4112a3ea..122b85383f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,7 +28,6 @@ src/conf/object_event.c
 src/conf/secret_conf.c
 src/conf/snapshot_conf.c
 src/conf/storage_conf.c
-src/conf/storage_encryption_conf.c
 src/conf/virchrdev.c
 src/cpu/cpu.c
 src/cpu/cpu_generic.c
@@ -193,6 +192,7 @@ src/util/virsexpr.c
 src/util/virscsi.c
 src/util/virsocketaddr.c
 src/util/virstatslinux.c
+src/util/virstorageencryption.c
 src/util/virstoragefile.c
 src/util/virstring.c
 src/util/virsysinfo.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 54206e4131..38b269758c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -146,6 +146,7 @@ UTIL_SOURCES =							\
 		util/virsexpr.c util/virsexpr.h			\
 		util/virsocketaddr.h util/virsocketaddr.c	\
 		util/virstatslinux.c util/virstatslinux.h	\
+		util/virstorageencryption.c util/virstorageencryption.h \
 		util/virstoragefile.c util/virstoragefile.h	\
 		util/virstring.h util/virstring.c		\
 		util/virsysinfo.c util/virsysinfo.h		\
@@ -288,9 +289,6 @@ SECRET_CONF_SOURCES =                                          \
 NODE_DEVICE_CONF_SOURCES =                                     \
 		conf/node_device_conf.c conf/node_device_conf.h
 
-ENCRYPTION_CONF_SOURCES =					\
-		conf/storage_encryption_conf.c conf/storage_encryption_conf.h
-
 CPU_CONF_SOURCES =						\
 		conf/cpu_conf.c conf/cpu_conf.h
 
@@ -312,7 +310,6 @@ CONF_SOURCES =							\
 		$(NWFILTER_CONF_SOURCES)			\
 		$(NODE_DEVICE_CONF_SOURCES)			\
 		$(STORAGE_CONF_SOURCES)				\
-		$(ENCRYPTION_CONF_SOURCES)			\
 		$(INTERFACE_CONF_SOURCES)			\
 		$(SECRET_CONF_SOURCES)				\
 		$(CPU_CONF_SOURCES)				\
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bf92593e3a..b2eeefd69b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -30,7 +30,7 @@
 
 # include "internal.h"
 # include "capabilities.h"
-# include "storage_encryption_conf.h"
+# include "virstorageencryption.h"
 # include "cpu_conf.h"
 # include "virthread.h"
 # include "virhash.h"
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index e410f41448..b811046848 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -1,7 +1,7 @@
 /*
  * storage_conf.h: config handling for storage driver
  *
- * Copyright (C) 2006-2008, 2010-2013 Red Hat, Inc.
+ * Copyright (C) 2006-2008, 2010-2014 Red Hat, Inc.
  * Copyright (C) 2006-2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 # define __VIR_STORAGE_CONF_H__
 
 # include "internal.h"
-# include "storage_encryption_conf.h"
+# include "virstorageencryption.h"
 # include "virbitmap.h"
 # include "virthread.h"
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 99781a241c..60c2d447c4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -729,13 +729,6 @@ virStorageVolTypeFromString;
 virStorageVolTypeToString;
 
 
-# conf/storage_encryption_conf.h
-virStorageEncryptionFormat;
-virStorageEncryptionFree;
-virStorageEncryptionParseNode;
-virStorageGenerateQcowPassphrase;
-
-
 # conf/virchrdev.h
 virChrdevAlloc;
 virChrdevFree;
@@ -1815,6 +1808,13 @@ virSocketAddrSetIPv4Addr;
 virSocketAddrSetPort;
 
 
+# util/virstorageencryption.h
+virStorageEncryptionFormat;
+virStorageEncryptionFree;
+virStorageEncryptionParseNode;
+virStorageGenerateQcowPassphrase;
+
+
 # util/virstoragefile.h
 virStorageFileChainGetBroken;
 virStorageFileChainLookup;
diff --git a/src/conf/storage_encryption_conf.c b/src/util/virstorageencryption.c
similarity index 98%
rename from src/conf/storage_encryption_conf.c
rename to src/util/virstorageencryption.c
index bba067b904..90892784cc 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/util/virstorageencryption.c
@@ -1,5 +1,5 @@
 /*
- * storage_encryption_conf.c: volume encryption information
+ * virstorageencryption.c: volume encryption information
  *
  * Copyright (C) 2009-2014 Red Hat, Inc.
  *
@@ -29,8 +29,7 @@
 
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "storage_conf.h"
-#include "storage_encryption_conf.h"
+#include "virstorageencryption.h"
 #include "virxml.h"
 #include "virerror.h"
 #include "viruuid.h"
diff --git a/src/conf/storage_encryption_conf.h b/src/util/virstorageencryption.h
similarity index 95%
rename from src/conf/storage_encryption_conf.h
rename to src/util/virstorageencryption.h
index 57ab1a0135..03c38a57a0 100644
--- a/src/conf/storage_encryption_conf.h
+++ b/src/util/virstorageencryption.h
@@ -1,7 +1,7 @@
 /*
- * storage_encryption_conf.h: volume encryption information
+ * virstorageencryption.h: volume encryption information
  *
- * Copyright (C) 2009-2011 Red Hat, Inc.
+ * Copyright (C) 2009-2011, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public