diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec
index 126e541..e057680 100644
--- a/kmod-testsuite.spec
+++ b/kmod-testsuite.spec
@@ -35,7 +35,6 @@ Patch3:         0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
 Patch4:         0010-modprobe-Implement-allow-unsupported-modules.patch
 Patch5:         0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
 Patch6:         0012-modprobe-print-unsupported-status.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  kernel-default-devel
diff --git a/kmod.changes b/kmod.changes
index 74194ac..f5eeb4c 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul  7 13:05:53 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Drop old RPM constructs from the build recipe.
+
+-------------------------------------------------------------------
+Fri Jul  3 11:36:22 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
+
+- Drop kmod-compat (boo#1173353):
+  The symlinks in kmod-compat are not obsolete. They are
+  desirable for kernel module autoload. The "kernel.modprobe"
+  sysctl references /sbin/modprobe, and changing it to
+  "/usr/bin/kmod load" is not possible, because this sysctl
+  specifies a single executable, not a command (so spaces will be
+  treated as part of the filename).
+
 -------------------------------------------------------------------
 Wed May 27 23:31:52 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/kmod.spec b/kmod.spec
index d694016..75c60eb 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -35,7 +35,6 @@ Patch3:         0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
 Patch4:         0010-modprobe-Implement-allow-unsupported-modules.patch
 Patch5:         0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
 Patch6:         0012-modprobe-print-unsupported-status.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libopenssl-devel >= 1.1.0
@@ -45,7 +44,12 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(liblzma) >= 4.99
 BuildRequires:  pkgconfig(zlib)
 Requires(post): coreutils
-Conflicts:      kmod-compat < 25
+Obsoletes:      kmod-compat < %version-%release
+Provides:       kmod-compat = %version-%release
+Requires:       suse-module-tools
+Obsoletes:      module-init-tools < 3.16
+Provides:       module-init-tools = 3.16
+Provides:       modutils
 
 %description
 kmod is a set of tools to handle common tasks with Linux kernel
@@ -65,23 +69,6 @@ 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-or-later
-Group:          System/Kernel
-Requires:       kmod = %version-%release
-Requires:       suse-module-tools
-Obsoletes:      module-init-tools < 3.16
-Provides:       module-init-tools = 3.16
-Provides:       modutils
-
-%description compat
-kmod is a set of tools to handle common tasks with Linux kernel
-modules like insert, remove, list, check properties, resolve
-dependencies and aliases.
-
-This package contains traditional name symlinks (lsmod, etc.)
-
 %package -n %lname
 Summary:        Library to interact with Linux kernel modules
 License:        LGPL-2.1-or-later
@@ -147,7 +134,6 @@ done
 %postun -n %lname -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %_bindir/kmod
 %_bindir/lsmod
 %_sbindir/depmod
@@ -157,24 +143,6 @@ done
 %_sbindir/modprobe
 %_sbindir/rmmod
 %_mandir/man[58]/*.[58]*
-
-%files bash-completion
-%defattr(-,root,root)
-%_datadir/bash-completion/
-
-%files -n %lname
-%defattr(-,root,root)
-%_libdir/libkmod.so.2*
-
-%files -n libkmod-devel
-%defattr(-,root,root)
-%_includedir/*
-%_libdir/pkgconfig/libkmod.pc
-%_libdir/libkmod.so
-
-%files compat
-%defattr(-,root,root)
-# The very very old paths (UsrMerge)
 /bin/lsmod
 /sbin/depmod
 /sbin/insmod
@@ -182,6 +150,16 @@ done
 /sbin/modinfo
 /sbin/modprobe
 /sbin/rmmod
-# EndUsrMerge
+
+%files bash-completion
+%_datadir/bash-completion/
+
+%files -n %lname
+%_libdir/libkmod.so.2*
+
+%files -n libkmod-devel
+%_includedir/*
+%_libdir/pkgconfig/libkmod.pc
+%_libdir/libkmod.so
 
 %changelog