diff --git a/modules-mls.conf b/modules-mls.conf
index d22f31f..819f9c4 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -125,11 +125,11 @@ application = module
 arpwatch = module
 
 # Layer: services
-# Module: audioentropy
+# Module: entropy
 #
 # Generate entropy from audio input
 # 
-audioentropy = module
+entropy = module
 
 # Layer: system
 # Module: authlogin
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 62245b2..06392d7 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -160,11 +160,11 @@ application = module
 arpwatch = module
 
 # Layer: services
-# Module: audioentropy
+# Module: entropy
 #
 # Generate entropy from audio input
 # 
-audioentropy = module
+entropy = module
 
 # Layer: system
 # Module: authlogin
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 1983e28..3b565bf 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -213,7 +213,7 @@ fi;
 if [ -e /etc/selinux/%2/.rebuild ]; then \
    rm /etc/selinux/%2/.rebuild; \
    if [ %1 -ne 1 ]; then \
-	/usr/sbin/semodule -n -s %2 -r execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
+	/usr/sbin/semodule -n -s %2 -r execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd 2>/dev/null; \
    fi \
    rm -f  /etc/selinux/%2/modules/active/modules/qemu.pp /etc/selinux/%2/modules/active/modules/nsplugin.pp \
    /usr/sbin/semodule -B -n -s %2; \