diff --git a/kmod.changes b/kmod.changes
index 79759f5..a7fd617 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -12,6 +12,10 @@ Thu Jul  6 08:07:50 UTC 2017 - jengelh@inai.de
   0002-depmod-ignore-related-modules-in-depmod_report_cycle.patch,
   0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
   (applied upstream)
+- Remove support for openSUSE < 13.2 (non-dracut mkinitrd)
+- Separate bash completion functions into extra package
+- Move some of the symlinks from kmod-compat to kmod,
+  as kmod still does not have native support for all functions.
 
 -------------------------------------------------------------------
 Tue Nov 22 09:10:54 UTC 2016 - yousaf.kaukab@suse.com
diff --git a/kmod.spec b/kmod.spec
index faa11d7..47b9791 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -54,6 +54,15 @@ These tools are designed on top of libkmod, a library that is shipped
 with kmod. The aim is to be compatible with tools, configurations and
 indexes from module-init-tools project.
 
+%package bash-completion
+Summary:        Bash completion routines for the kmod utilities
+License:        LGPL-2.1+ and GPL-2.0+
+Group:          System/Shells
+BuildArch:      noarch
+
+%description bash-completion
+Contains bash completion support for kmod utilities.
+
 %package compat
 Summary:        Compat symlinks for kernel module utilities
 License:        GPL-2.0+
@@ -114,19 +123,10 @@ b="%buildroot"
 %make_install
 rm -f "$b/%_libdir"/*.la
 
-mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin"
+mkdir -p "$b/%_sbindir" "$b/sbin"
 for i in depmod insmod lsmod modinfo modprobe rmmod; do
-	#
-	# kmod-compat and kmod-compat(usrmerge)
-	#
 	ln -s "%_bindir/kmod" "$b/%_sbindir/$i"
 	ln -s "%_bindir/kmod" "$b/sbin/$i"
-
-	#
-	# Make symlinks also available in normal fashion,
-	# so one can actually run it.
-	#
-	ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i"
 done
 mkdir -p "$b/%_bindir" "$b/bin"
 for i in lsmod; do
@@ -134,18 +134,6 @@ for i in lsmod; do
 	ln -s "%_bindir/kmod" "$b/bin/$i"
 done
 
-#
-# make (all ancient versions of) mkinitrd happy which did not look in /usr
-#
-mkdir -p "$b"/{bin,sbin,%_lib}
-ln -s "%_bindir/kmod" "$b/bin/"
-ls -l "$b/%_libdir/"
-%if "%_libdir" != "/%_lib"
-ln -s "%_libdir/libkmod.so.2.3.1" "$b/%_lib/"
-ln -s libkmod.so.2.3.1 "$b/%_lib/libkmod.so.2"
-ls -l "$b/%_lib/"
-%endif
-
 %post
 %{?regenerate_initrd_post}
 
@@ -158,15 +146,22 @@ ls -l "$b/%_lib/"
 %files
 %defattr(-,root,root)
 %_bindir/kmod
-%_libexecdir/kmod
-/bin/kmod
+%_bindir/lsmod
+%_sbindir/depmod
+%_sbindir/insmod
+%_sbindir/lsmod
+%_sbindir/modinfo
+%_sbindir/modprobe
+%_sbindir/rmmod
+%_mandir/man[58]/*.[58]*
+
+%files bash-completion
+%defattr(-,root,root)
 %_datadir/bash-completion/
-%_mandir/man8/kmod.8*
 
 %files -n %lname
 %defattr(-,root,root)
 %_libdir/libkmod.so.2*
-/%_lib/libkmod.so.2*
 
 %files -n libkmod-devel
 %defattr(-,root,root)
@@ -176,14 +171,7 @@ ls -l "$b/%_lib/"
 
 %files compat
 %defattr(-,root,root)
-%_bindir/lsmod
-%_sbindir/depmod
-%_sbindir/insmod
-%_sbindir/lsmod
-%_sbindir/modinfo
-%_sbindir/modprobe
-%_sbindir/rmmod
-# UsrMerge
+# The very very old paths (UsrMerge)
 /bin/lsmod
 /sbin/depmod
 /sbin/insmod
@@ -192,15 +180,5 @@ ls -l "$b/%_lib/"
 /sbin/modprobe
 /sbin/rmmod
 # EndUsrMerge
-%_mandir/man5/depmod.d.5*
-%_mandir/man5/modprobe.d.5*
-%_mandir/man5/modules.dep.5*
-%_mandir/man5/modules.dep.bin.5*
-%_mandir/man8/depmod.8*
-%_mandir/man8/insmod.8*
-%_mandir/man8/lsmod.8*
-%_mandir/man8/modinfo.8*
-%_mandir/man8/modprobe.8*
-%_mandir/man8/rmmod.8*
 
 %changelog