diff --git a/dracut.changes b/dracut.changes
index 1f73581..9456de2 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 29 15:43:28 UTC 2014 - meissner@suse.com
+
+- consolidate -fips-aesni into -fips again. The problem due to it
+  was split off upstream was solved in the kernel.
+
 -------------------------------------------------------------------
 Fri Apr 25 13:48:45 UTC 2014 - meissner@suse.com
 
diff --git a/dracut.spec b/dracut.spec
index 4463c69..45154dd 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -106,17 +106,6 @@ This package requires everything which is needed to build an
 initramfs with dracut, which does an integrity check of the kernel
 and its cryptography during startup.
 
-%package fips-aesni
-Summary:        dracut modules to build a dracut initramfs with an integrity check with aesni-intel
-Group:          System/Base
-Requires:       %{name}-fips = %{version}-%{release}
-
-%description fips-aesni
-This package requires everything which is needed to build an
-initramfs with dracut, which does an integrity check on vmlinuz and the crypto system
-and also adds the aesni-intel kernel module.
-
-
 %prep
 %setup -q
 %patch10 -p1
@@ -221,10 +210,6 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
 %doc COPYING
 %config %{_sysconfdir}/dracut.conf.d/40-fips.conf
 %{dracutlibdir}/modules.d/01fips
-
-%files fips-aesni
-%defattr(-,root,root,0755)
-%doc COPYING
 %{dracutlibdir}/modules.d/02fips-aesni
 
 %files