diff --git a/SOURCES/0243-fips-add-some-s390-kernel-modules.patch b/SOURCES/0243-fips-add-some-s390-kernel-modules.patch
new file mode 100644
index 0000000..313dba1
--- /dev/null
+++ b/SOURCES/0243-fips-add-some-s390-kernel-modules.patch
@@ -0,0 +1,22 @@
+From 8f1febc874fff908c58c2c1d7725281eacce6ff5 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Tue, 28 Apr 2015 10:46:33 +0200
+Subject: [PATCH] fips: add some s390 kernel modules
+
+(cherry picked from commit 822a7ae50431998dc359439cd6f5133c9d0e2cfb)
+---
+ modules.d/01fips/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 48156e7..dd8e47d 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -17,6 +17,7 @@ installkernel() {
+     _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+     _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+     _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
++    _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
+ 
+     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+ 
diff --git a/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch b/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch
new file mode 100644
index 0000000..03a243d
--- /dev/null
+++ b/SOURCES/0244-rearrange-fips-module-ordering-due-to-zlib.patch
@@ -0,0 +1,25 @@
+From a503d1dda9fd9d3a26062aef46a79024d01f163f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 7 May 2015 14:29:22 +0200
+Subject: [PATCH] rearrange fips module ordering due to zlib
+
+[    1.220106] alg: pcomp: Failed to load transform for zlib: -2
+[    1.221346] alg: pcomp: Failed to load transform for zlib: -2
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index dd8e47d..77ed24e 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -16,8 +16,8 @@ installkernel() {
+     _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+     _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+     _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
+-    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
+     _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
++    _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
+ 
+     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
+ 
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index b34c299..c410681 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 241%{?dist}.1
+Release: 241%{?dist}.3
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -270,6 +270,8 @@ Patch238: 0238-network-ifup-source-team-info-if-present.patch
 Patch239: 0239-fips-add-drbg-kernel-module.patch
 Patch240: 0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch
 
+Patch243: 0243-fips-add-some-s390-kernel-modules.patch
+Patch244: 0244-rearrange-fips-module-ordering-due-to-zlib.patch
 
 BuildRequires: bash git
 
@@ -695,6 +697,14 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu May 07 2015 Harald Hoyer <harald@redhat.com> 033-241.3
+- fips: rearrange fips modules due to zlib
+Resolves: rhbz#1216086
+
+* Tue Apr 28 2015 Harald Hoyer <harald@redhat.com> 033-241.2
+- fips: add some s390 kernel modules
+Resolves: rhbz#1216086
+
 * Thu Feb 19 2015 Harald Hoyer <harald@redhat.com> 033-241.1
 - subversion inc