diff --git a/openafs.changes b/openafs.changes
index 7846992..fea56df 100644
--- a/openafs.changes
+++ b/openafs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 12 05:46:01 UTC 2018 - christof.hanke@mpcdf.mpg.de
+
+- add retpoline support
+
 -------------------------------------------------------------------
 Sun Sep  9 08:14:26 UTC 2018 - christof.hanke@mpcdf.mpg.de
 
diff --git a/openafs.spec b/openafs.spec
index 43463b4..107e0bb 100644
--- a/openafs.spec
+++ b/openafs.spec
@@ -369,9 +369,12 @@ for flavor in %flavors_to_build; do
     rm -rf obj/$flavor
     cp -a libafs_tree obj/$flavor
     pushd obj/$flavor
+    find . -name *.c -print0 | xargs -0 sed -i '/MODULE_LICENSE(/a MODULE_INFO(retpoline, "Y");'
     ./configure  --with-linux-kernel-build=/usr/src/linux-obj/%{_target_cpu}/$flavor --with-linux-kernel-headers=/usr/src/linux \
         --disable-transarc-paths
-    export LINUX_MAKE_ARCH=%{?linux_make_arch}
+    export EXTRA_CFLAGS='-DVERSION=\"%version\"'
+    export KCFLAGS='-mindirect-branch=thunk-inline -mindirect-branch-register'
+    export LINUX_MAKE_ARCH="ARCH=%{_arch}"
     make
     popd
 done