diff --git a/systemtap.spec b/systemtap.spec
index c2e83eb..60720d9 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -70,7 +70,7 @@
 
 Name: systemtap
 Version: 3.1
-Release: 0.20161205gitda79853%{?dist}
+Release: 0.20161212git2cd5c93%{?dist}
 # for version, see also configure.ac
 
 
@@ -103,7 +103,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20161205gitda79853.tar.gz
+Source: %{name}-%{version}-0.20161212git2cd5c93.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -530,14 +530,10 @@ for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
     echo "%%lang($lang) $dir/man*/*" >> %{name}.lang
 done
 
-# We want the examples in the special doc dir, not the build install dir.
-# We build it in place and then move it away so it doesn't get installed
-# twice. rpm can specify itself where the (versioned) docs go with the
-# %doc directive.
-mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
+ln -s %{_datadir}/systemtap/examples
 
 # Fix paths in the example scripts.
-find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
+find $RPM_BUILD_ROOT%{_datadir}/systemtap/examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
 
 # To make rpmlint happy, remove any .gitignore files in the testsuite.
 find testsuite -type f -name '.gitignore' -print0 | xargs -0 rm -f
@@ -968,7 +964,8 @@ done
 
 %files client -f systemtap.lang
 %defattr(-,root,root)
-%doc README README.unprivileged AUTHORS NEWS examples
+%doc README README.unprivileged AUTHORS NEWS
+%{_datadir}/systemtap/examples
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %if %{with_docs}
@@ -1064,6 +1061,10 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Mon Dec 12 2016 Lukas Berk <lberk@redhat.com> - 3.1-0.20161212git2cd5c93
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Dec 05 2016 Lukas Berk <lberk@redhat.com> - 3.1-0.20161205gitda79853
 - Automated weekly rawhide release