diff --git a/_servicedata b/_servicedata
index a04ba2d..d9a13ae 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
-              <param name="changesrevision">3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">7272c960f4b8d3a07cf5ac5c1a946df876c488c7</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-16.0.19.obscpio b/suse-module-tools-16.0.19.obscpio
deleted file mode 100644
index 46ca3e1..0000000
--- a/suse-module-tools-16.0.19.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63dc468154195da627c6cca516037646249b9af2cd67f6bc4cc3acdc97a0284a
-size 131595
diff --git a/suse-module-tools-16.0.20.obscpio b/suse-module-tools-16.0.20.obscpio
new file mode 100644
index 0000000..286a702
--- /dev/null
+++ b/suse-module-tools-16.0.20.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8e124cc1e7ab139ccfb6b1243b92a783536e3f1063be67eb5ee01ed1570a654
+size 134667
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index fdab29c..6843f2f 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun  2 10:55:37 UTC 2022 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 16.0.20:
+  * Bump version to 16.0.20
+  * driver-check.sh: avoid false positive error messages (boo#1200107)
+  * don't hardcode /boot for kernel-related files (boo#1199873)
+  * spec file: use "install -p" consistently
+
 -------------------------------------------------------------------
 Fri Jan 28 21:00:00 UTC 2022 - Martin Wilck <mwilck@suse.com>
 
diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo
index 8cba3a1..8bb1dec 100644
--- a/suse-module-tools.obsinfo
+++ b/suse-module-tools.obsinfo
@@ -1,4 +1,4 @@
 name: suse-module-tools
-version: 16.0.19
-mtime: 1643402151
-commit: 3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1
+version: 16.0.20
+mtime: 1654160193
+commit: 7272c960f4b8d3a07cf5ac5c1a946df876c488c7
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 9cad0bb..70d8964 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -45,7 +45,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.19
+Version:        16.0.20
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -169,26 +169,25 @@ install -pm 755 kmp-install "%{buildroot}%{_bindir}/"
 install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
 echo '[Unit]' >"%{buildroot}%{sysctl_dropin}"
 %if %{with kernel_sysctl}
-install -m 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
 echo 'Wants=kernel-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
 %endif
 %if %{with boot_sysctl}
-install -m 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
 echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
 %endif
 
-# Ensure that the sg driver is loaded early (bsc#1036463)
-# Not needed in SLE11, where sg is loaded via udev rule.
 install -d -m 755 "%{buildroot}%{_modulesloaddir}"
-install -pm 644 sg.conf "%{buildroot}%{_modulesloaddir}"
+install -pm 644 -t "%{buildroot}%{_modulesloaddir}" modules-load.d/*.conf
+
 %ifarch ppc64 ppc64le
 install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
-install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
+install -pm 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
 %endif
 
 # udev rules (formerly system-tuning-common-SUSE, udev-extra-rules)
 install -d -m 755 %{buildroot}%{_udevrulesdir}
-install -m 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
+install -pm 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
 
 mkdir -p %{buildroot}%{_defaultlicensedir}