diff --git a/Changelog b/Changelog
index cb3b80da1..a66482f0e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Rename audioentropy module to entropyd due to haveged support.
 - Add haveged support from Sven Vermeulen.
 - Authentication file patch from Matthew Ife.
 - Add agent support to zabbix from Sven Vermeulen.
diff --git a/policy/modules/services/audioentropy.fc b/policy/modules/services/entropyd.fc
similarity index 100%
rename from policy/modules/services/audioentropy.fc
rename to policy/modules/services/entropyd.fc
diff --git a/policy/modules/services/audioentropy.if b/policy/modules/services/entropyd.if
similarity index 100%
rename from policy/modules/services/audioentropy.if
rename to policy/modules/services/entropyd.if
diff --git a/policy/modules/services/audioentropy.te b/policy/modules/services/entropyd.te
similarity index 98%
rename from policy/modules/services/audioentropy.te
rename to policy/modules/services/entropyd.te
index 075a9308a..3bc26b568 100644
--- a/policy/modules/services/audioentropy.te
+++ b/policy/modules/services/entropyd.te
@@ -1,4 +1,4 @@
-policy_module(audioentropy, 1.6.2)
+policy_module(entropyd, 1.6.2)
 
 ########################################
 #