diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index b1e1aea..a918276 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -1431,6 +1431,8 @@ Provides:       multiversion(kernel)
 # tell weak-modules2 to ignore this package
 Provides:       kmp_in_kernel
 Requires(post): suse-module-tools >= 12.4
+Enhances:	%name
+Supplements:	packageand(%name:%@KMP_NAME@-%build_flavor)
 @KMP_DEPS@
 
 %description -n @KMP_NAME@-%build_flavor
diff --git a/rpm/kernel-source.rpmlintrc b/rpm/kernel-source.rpmlintrc
index a63f94e..fa0fc43 100644
--- a/rpm/kernel-source.rpmlintrc
+++ b/rpm/kernel-source.rpmlintrc
@@ -10,7 +10,3 @@ addFilter("dangling-symlink .*/lib/modules/[1-9].*/source")
 addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.config")
 addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.kernel-binary.spec.buildenv")
 addFilter("hidden-file-or-dir /boot/\..*\.hmac")
-# This check ensures that KMPs are built using the %kernel_module_package
-# macro, but we are deliberately not doing this for KMPs built from the
-# kernel spec file (fate#319339)
-addFilter("suse-policy-kmp-missing-supplements")