diff --git a/sources b/sources
index beb2003..d4e8f68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2017_U6.tar.gz) = 76b49fd085d8407b68b0f17e6eebfbcb7d2e6f9116bb5f6a00c6b4d59a55b16f9de79a2b9c9c3ece497b01810c33df21d0657893fd886db8bed639091ba97060
+SHA512 (2017_U7.tar.gz) = 77fdd381eece8fb2fba4115af55d168e9d433bbdae3c21a53c35e7d5ed3397645fe75998ad10593b718f6959daaac05112401480cdb4fd2054f50b5f6f1a0df6
diff --git a/tbb.spec b/tbb.spec
index ee0b78b..042caac 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -1,5 +1,5 @@
 %global upver 2017
-%global uprel 6
+%global uprel 7
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_python3 1
@@ -102,6 +102,13 @@ Python 3 TBB module.
 sed -i 's/"`hostname -s`" ("`uname -m`"/fedorabuild (%{_arch}/' \
     build/version_info_linux.sh
 
+# Fix libdir on 64-bit systems
+if [ "%{_libdir}" != "%{_prefix}/lib" ]; then
+  sed -i.orig 's/"lib"/"%{_lib}"/' cmake/TBBMakeConfig.cmake
+  touch -r cmake/TBBMakeConfig.cmake.orig cmake/TBBMakeConfig.cmake
+  rm cmake/TBBMakeConfig.cmake.orig
+fi
+
 # Prepare to build the python module for both python 2 and python 3
 cp -a python python3
 
@@ -186,21 +193,28 @@ pushd python3
 popd
 %endif
 
+# Install the cmake files
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake
+cp -a cmake $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}
+rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc LICENSE doc/Release_Notes.txt
+%doc doc/Release_Notes.txt README.md
+%license LICENSE
 %{_libdir}/*.so.2
 %ifarch %{ix86}
 %{_libdir}/sse2/*.so.2
 %endif
 
 %files devel
-%doc CHANGES
+%doc CHANGES cmake/README.rst
 %{_includedir}/tbb
 %{_libdir}/*.so
+%{_libdir}/cmake/
 %{_libdir}/pkgconfig/*.pc
 
 %files doc
@@ -221,6 +235,11 @@ popd
 %endif
 
 %changelog
+* Thu Jun  8 2017 Jerry James <loganjerry@gmail.com> - 2017.%{uprel}-1
+- Rebase to 2017 update 7
+- Use the license macro
+- Ship the new cmake files in -devel
+
 * Tue May 16 2017 Jerry James <loganjerry@gmail.com> - 2017.%{uprel}-1
 - Rebase to 2017 update 6