diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 4bac7d6..05e4dc0 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 17 06:18:33 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Only ship RPM macros up to suse_version 1500: after that, the
+  macros can be found in the rpm-config-SUSE package.
+
 -------------------------------------------------------------------
 Fri May 10 09:18:57 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 9950c08..47eb7cd 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -101,9 +101,13 @@ install -d -m 755 "%{buildroot}%{_libexecdir}/module-init-tools"
 install -pm 755 weak-modules{,2} "%{buildroot}%{_libexecdir}/module-init-tools/"
 install -pm 755 driver-check.sh "%{buildroot}%{_libexecdir}/module-init-tools/"
 
+%if 0%{?suse_version} < 1550
 # rpm macros and helper
+# The RPM Macros have been moved to the package rpm-config-SUSE after CODE15, thus are no longer
+# shipped here
 install -d -m 755 "%{buildroot}%{_rpmmacrodir}"
 install -pm 644 "macros.initrd" "%{buildroot}%{_rpmmacrodir}"
+%endif
 install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}%{_libexecdir}/module-init-tools/"
 
 install -d -m 755 "%{buildroot}%{_prefix}/bin"
@@ -247,7 +251,9 @@ done
 %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf
 %dir %{_sysconfdir}/depmod.d
 %config %{_sysconfdir}/depmod.d/00-system.conf
+%if 0%{?suse_version} < 1550
 %{_rpmmacrodir}/macros.initrd
+%endif
 %{_bindir}/modhash
 %{_bindir}/kmp-install
 %{_libexecdir}/module-init-tools