diff --git a/.gitignore b/.gitignore
index 049b3ea..3f3590b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,3 +218,4 @@ systemtap-1.3.tar.gz
 /systemtap-3.1-0.20170109gitf8bc2a5.tar.gz
 /systemtap-3.1-0.20170116git3d13f4e.tar.gz
 /systemtap-3.1-0.20170116gitd5eac54.tar.gz
+/systemtap-3.1-0.20170116git8065f5d.tar.gz
diff --git a/sources b/sources
index c78e6fc..542ae92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-3.1-0.20170116gitd5eac54.tar.gz) = 64d4f2a8b1100ab2fe9919ca8489da81917cf6f024938c1eec9473a845b5219308597b404dade4c6daae09ee486da7b5f38764e0364d61908e5757a27a76ec46
+SHA512 (systemtap-3.1-0.20170116git8065f5d.tar.gz) = 63ccbefd556eb513d9cb8e5bf2c3c74d909c03eca04e8cd0b727c81fce902f03a918a3a8b4de51c2e608f82278694a174f0d1099a3a4d0f511bb4c68ef27a564
diff --git a/systemtap.spec b/systemtap.spec
index e228aff..e9da7fc 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -72,7 +72,7 @@
 
 Name: systemtap
 Version: 3.1
-Release: 0.20170116gitd5eac54%{?dist}
+Release: 0.20170116git8065f5d%{?dist}
 # for version, see also configure.ac
 
 
@@ -107,7 +107,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20170116gitd5eac54.tar.gz
+Source: %{name}-%{version}-0.20170116git8065f5d.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -983,6 +983,10 @@ done
 %{_emacs_sitestartdir}/systemtap-init.el
 %{_datadir}/vim/vimfiles/*/*.vim
 %endif
+%if %{with_python3_probes} || %{with_python2_probes}
+%{_libexecdir}/systemtap/python/stap-resolve-module-function.py
+%exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
+%endif
 
 
 %files runtime -f systemtap.lang
@@ -1092,17 +1096,13 @@ done
 # python script to help list python probes.
 %if %{with_python2_probes}
 %files runtime-python2
-%{python_sitelib}/HelperSDT
-%{python_sitelib}/HelperSDT-*.egg-info
-%{_libexecdir}/systemtap/python/stap-resolve-module-function.py
-%exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
+%{python_sitearch}/HelperSDT
+%{python_sitearch}/HelperSDT-*.egg-info
 %endif
 %if %{with_python3_probes}
 %files runtime-python3
-%{python3_sitelib}/HelperSDT
-%{python3_sitelib}/HelperSDT-*.egg-info
-%{_libexecdir}/systemtap/python/stap-resolve-module-function.py
-%exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
+%{python3_sitearch}/HelperSDT
+%{python3_sitearch}/HelperSDT-*.egg-info
 %endif
 
 %if %{with_virthost}
@@ -1133,6 +1133,10 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Mon Jan 16 2017 Lukas Berk <lberk@redhat.com> - 3.1-0.20170116git8065f5d
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Jan 16 2017 Lukas Berk <lberk@redhat.com> - 3.1-0.20170116gitd5eac54
 - Automated weekly rawhide release