diff --git a/kmod-testsuite.changes b/kmod-testsuite.changes
index 49d092d..6729a2a 100644
--- a/kmod-testsuite.changes
+++ b/kmod-testsuite.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com
-
-- Do link zlib and xz, as we are not building compressed modules.
-
 -------------------------------------------------------------------
 Thu Mar 31 16:53:28 UTC 2016 - normand@linux.vnet.ibm.com
 
diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec
index 6f3c90e..912988d 100644
--- a/kmod-testsuite.spec
+++ b/kmod-testsuite.spec
@@ -46,6 +46,13 @@ BuildRequires:  kernel-default-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
+%if 0%{?sles_version} == 11
+BuildRequires:  xz-devel >= 4.99
+BuildRequires:  zlib-devel
+%else
+BuildRequires:  pkgconfig(liblzma) >= 4.99
+BuildRequires:  pkgconfig(zlib)
+%endif
 Requires:       suse-module-tools
 %define kdir /usr/src/linux-obj/%_target_cpu/default
 
@@ -60,11 +67,15 @@ buildloop with the kernel.
 
 %build
 autoreconf -fi
+export LDFLAGS="-Wl,-z,relro,-z,now"
 # The extra --includedir gives us the possibility to detect dependent
 # packages which fail to properly use pkgconfig.
 %configure \
-	--without-xz \
-	--without-zlib \
+%if 0%{?sles_version} == 11
+	zlib_CFLAGS=" " zlib_LIBS="-lz" \
+%endif
+	--with-xz \
+	--with-zlib \
 	--includedir="%_includedir/kmod" \
 	--with-rootlibdir="%_libdir" \
 	--bindir="%_bindir"
diff --git a/kmod.changes b/kmod.changes
index 3bf99a5..317ba36 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com
-
-- Do link zlib and xz, as we are not building compressed modules.
-
 -------------------------------------------------------------------
 Fri Jun 17 15:18:29 UTC 2016 - mmarek@suse.cz
 
diff --git a/kmod.spec b/kmod.spec
index 2f9c8c5..9ca5cc2 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -45,6 +45,13 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  suse-module-tools
 BuildRequires:  xz
+%if 0%{?sles_version} == 11
+BuildRequires:  xz-devel >= 4.99
+BuildRequires:  zlib-devel
+%else
+BuildRequires:  pkgconfig(liblzma) >= 4.99
+BuildRequires:  pkgconfig(zlib)
+%endif
 Requires:       suse-module-tools
 
 %description
@@ -100,11 +107,15 @@ in %lname.
 
 %build
 autoreconf -fi
+export LDFLAGS="-Wl,-z,relro,-z,now"
 # The extra --includedir gives us the possibility to detect dependent
 # packages which fail to properly use pkgconfig.
 %configure \
-	--without-xz \
-	--without-zlib \
+%if 0%{?sles_version} == 11
+	zlib_CFLAGS=" " zlib_LIBS="-lz" \
+%endif
+	--with-xz \
+	--with-zlib \
 	--includedir="%_includedir/kmod" \
 	--with-rootlibdir="%_libdir" \
 	--bindir="%_bindir"