diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index b6f5fb7..99e4cfe 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz
+
+- Only handle KMPs that are built using the %kernel_module_package
+  macro (preparatory work for fate#319339).
+
 -------------------------------------------------------------------
 Tue Jun 23 14:39:46 UTC 2015 - mmarek@suse.cz
 
diff --git a/weak-modules2 b/weak-modules2
index 900e4d5..8e9bb35 100644
--- a/weak-modules2
+++ b/weak-modules2
@@ -247,7 +247,9 @@ find_kmps() {
     local basename=$1 flavor=$2
     local kmp
 
-    for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do
+    # Only consider KMPs that are built using the %kernel_module_package macro
+    # and have the _k<kver> string in their version
+    for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor" | grep '_k[1-9][^-]*-[^-]*$'); do
 	rpm -ql --nodigest --nosignature "$kmp" \
 	    | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \
 	    > $tmpdir/modules-$kmp