diff --git a/kmod-20.tar.sign b/kmod-20.tar.sign
deleted file mode 100644
index 0225148..0000000
--- a/kmod-20.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJU81XMAAoJEJuipaYwy+pTzN8P/0Qy13vnSe1krvYNv1QxEAbp
-wyam2Nr0E9z9ZgA30LYRC8h0P9Su4UB/kOSU3PY189AkKndyLvcNPl49sqDdssgP
-nJUczQUv54hfOJqfW70TAHK292xPr0wCt17KC1mCpcIflUl/8TMYIoUxwNeVmsVT
-F+ZD4HZVhFQ46V8SxCD/fDK3/Ib/PQsGZtbEQaeDHu/VE6RUmGjBjUNtBUWbRqRw
-lNtKc07X8Zutx3/fjMrEvSTVTVK55Abqmi39kxD+9EN6Jv7AgZMt2DOfJKtcAr1K
-b070ZCUyxIUHmy+QOCil5GxnBm+ceggZkSpdr2CecJPWiYOV8MKsFoNHfXbt+sNU
-Ej1JFxbEhdIoH2jrHO9D7AB2ZBhLNCdVCmuuf1DzoVyeuJW5tUey7uefpPwhv5iE
-VSkqbg5CF4nFpxYScNUNKVMIprPAxz2q8SLWXMKf4j9AEPJFqsW6dUxx9YiGh4g0
-eZ3iie/oSz5aqwpket9V4O2bJhSN75qOnvYLvgJcRlHBk0geB0aIzq9cMrmsy6tJ
-hFd7tlk5zuoH+ehO/d13O3dOMmbMchcM+Q0lMDLrV0GTstxGCOtZ1pORV6FjQis2
-YZSYSHj1vG42nxdMqHxHJpPBYjtB0zliADYXhwSxtDNVY+22sAFJEvT0FhDoDaH8
-2Hc/3i5X9xhu/sGTuuWh
-=kPYD
------END PGP SIGNATURE-----
diff --git a/kmod-20.tar.xz b/kmod-20.tar.xz
deleted file mode 100644
index f0c06a2..0000000
--- a/kmod-20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0
-size 437880
diff --git a/kmod-21.tar.sign b/kmod-21.tar.sign
new file mode 100644
index 0000000..04005b3
--- /dev/null
+++ b/kmod-21.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVdnt4AAoJEJuipaYwy+pTX6sP+wXXGFL/4z/gKu0/TdfyFOrB
+Y2ijefNvIETxJsqj95tG+SjqaNlJnmfNpCDoJ08hmKJkgROw331F713MzV8SrOG2
+39sLtAlXGKapsVV0pFgfikNOsXEKDbifseyi8eAMZeEttTTO24P6+SwT9rDqzhij
+GXGLipGcBPzuyHeGv7o4j0hd7EWFL3t99aCoN8//ljEpv+Nfuw14uKM0CFOZlDjG
+6wvhTB471XcPzfuPZSjwSyQmw7Ov71UMyKnpapgaCiQ0m8TlSNHmTTel9bUEjJo8
+n9iiyA3gUdO4GfLY2Oo80jHyWSR/66W++lZ/VMis1PTWLEvgmRal3to/TwDFydvf
+AsWlU5tmjUn5SU7BKwtnDXTHVQnvkvnj4OiVs5XV3JsAjO+trrzWI6Jqa8yM+bYU
+PSVT4lgVnnfGgZL9vDZl8ZY6U7YGTsk0Dflkdq5L7Kj/YhRIwhCwoBg9+49j0lsI
+bNcZ3iwyHZVY//7g4DlAODc+qItrOTu2iBjbiS8qdpd9ta35VOM71uJkFPXoPoDH
+zr1hHIwJi4AuBkLz/SBccvmDJUXDh8VQXB0einK4+ZqplUbOMnvwp5CFJCwTd+J3
+DxTqD9ttXpu+SqlpOFUCd2HStBO2CLg/dvTqqdavupbolZNV6L37pJ/u1hP4yy2a
+Aop2TRBYBO+m9PIhq4qF
+=vfyz
+-----END PGP SIGNATURE-----
diff --git a/kmod-21.tar.xz b/kmod-21.tar.xz
new file mode 100644
index 0000000..f983868
--- /dev/null
+++ b/kmod-21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:160a9448af74cf75b08d089f37a3e8d1fafa75cce92d1cbe869a753b670d95c0
+size 446460
diff --git a/kmod-testsuite.changes b/kmod-testsuite.changes
index 36369ea..60a757d 100644
--- a/kmod-testsuite.changes
+++ b/kmod-testsuite.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Nov  7 10:40:29 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 21
+* Cache built modules so it is easier to run "make check" on
+  build servers by distro maintainers. If kmod is configured with
+  --disable-test-modules, the modules from cache will be used by
+  "make check". No changes to the tests are needed and all of
+  them can run fine.
+- Specify KDIR explicitly to resolve build failure with `osc build`
+  (because kmod uses `uname -r` and the kernel versions need not
+  match between build env and local host)
+
 -------------------------------------------------------------------
 Tue Apr 21 12:43:39 UTC 2015 - mmarek@suse.cz
 
diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec
index c1fd469..121b10a 100644
--- a/kmod-testsuite.spec
+++ b/kmod-testsuite.spec
@@ -18,7 +18,7 @@
 
 Name:           kmod-testsuite
 %define lname	libkmod2
-Version:        20
+Version:        21
 Release:        0
 Summary:        Testsuite of the kmod package
 License:        LGPL-2.1+ and GPL-2.0+
@@ -52,6 +52,7 @@ BuildRequires:  pkgconfig(liblzma) >= 4.99
 BuildRequires:  pkgconfig(zlib)
 %endif
 Requires:       suse-module-tools
+%define kdir /usr/src/linux-obj/%_target_cpu/default
 
 %description
 This spec file does not produce any binary RPMs. It just builds kmod and
@@ -76,12 +77,12 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 	--includedir="%_includedir/kmod" \
 	--with-rootlibdir="%_libdir" \
 	--bindir="%_bindir"
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1 KDIR="%kdir"
 
 %install
 # empty
 
 %check
-make check V=1
+make check V=1 KDIR="%kdir"
 
 %changelog
diff --git a/kmod.changes b/kmod.changes
index 04b987e..5f51124 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Nov  7 10:29:54 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 21
+* The kmod tool now prints the relevant configuration options it was built
+  with when the "--version" argument is passed.
+
 -------------------------------------------------------------------
 Tue Apr 21 14:38:55 UTC 2015 - mmarek@suse.cz
 
diff --git a/kmod.spec b/kmod.spec
index a35e3d5..7674773 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -18,7 +18,7 @@
 
 Name:           kmod
 %define lname	libkmod2
-Version:        20
+Version:        21
 Release:        0
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1+ and GPL-2.0+
@@ -152,7 +152,7 @@ mkdir -p "$b"/{bin,sbin,%_lib};
 ln -s "%_bindir/kmod" "$b/bin/";
 %if "%_libdir" != "/%_lib"
 ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
-ln -s "%_libdir/libkmod.so.2.2.10" "$b/%_lib/";
+ln -s "%_libdir/libkmod.so.2.2.11" "$b/%_lib/";
 %endif
 
 %post