diff --git a/cmake.attr b/cmake.attr
index 2b2bbbc..83f3f1a 100644
--- a/cmake.attr
+++ b/cmake.attr
@@ -1,2 +1,3 @@
 %__cmake_provides	%{_rpmconfigdir}/cmake.prov
-%__cmake_path		^/usr/lib(64)?/cmake/.*/.*(Config\.cmake|-config\.cmake)$
+%__cmake_requires	%{_rpmconfigdir}/cmake.req
+%__cmake_path		^(%{_libdir}|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$
diff --git a/cmake.req b/cmake.req
index 96c9086..2a58ca3 100644
--- a/cmake.req
+++ b/cmake.req
@@ -26,7 +26,6 @@
 
 import sys
 import re
-import glob
 import subprocess
 
 class CMakeParser:
@@ -44,7 +43,7 @@ class CMakeParser:
             modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
             if modulePath and cmakeModule:
                 has_module = True
-                if re.match("/usr/lib.*", path):
+                if re.match(".*/usr/lib(64)?/cmake/.*", modulePath):
                     is_arched = True
 
         if has_module:
diff --git a/cmake.spec b/cmake.spec
index 9a42955..5be05c1 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -41,7 +41,7 @@
 
 Name:           %{orig_name}%{?name_suffix}
 Version:        %{major_version}.%{minor_version}.0
-Release:        7%{?relsuf}%{?dist}
+Release:        8%{?relsuf}%{?dist}
 Summary:        Cross-platform make system
 
 # most sources are BSD
@@ -443,6 +443,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Aug 02 2017 Björn Esser <besser82@fedoraproject.org> - 3.9.0-8
+- Fix cmake.attr and cmake.req to work properly
+
 * Wed Aug 02 2017 Björn Esser <besser82@fedoraproject.org> - 3.9.0-7
 - Add cmake.req to autogenerate proper depency on cmake-filesystem