diff --git a/.gitignore b/.gitignore
index a3e101d..a649363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz
 /systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz
 /systemtap-3.2.tar.gz
+/systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz
diff --git a/sources b/sources
index eabc5df..30a5a3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-3.2.tar.gz) = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94
+SHA512 (systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz) = 984824eea52900492e77af7dc1ff3f3e0d4f4f8e46f1c54655174ee3f501dbb8674a6b60619e78e1c1638d31fc2c221b9d76b47306e59b489bd3abcf971003e7
diff --git a/systemtap.spec b/systemtap.spec
index ad71443..c40f884 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -33,7 +33,7 @@
 %{!?with_openssl: %global with_openssl 0}
 %endif
 %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
-%{!?with_python3: %global with_python3 0%{?fedora} >= 23}
+%{!?with_python3: %global with_python3 0%{?fedora} >= 23 || 0%{?rhel} > 7}
 %{!?with_python2_probes: %global with_python2_probes 1}
 %{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23}
 %{!?with_httpd: %global with_httpd 0}
@@ -76,12 +76,10 @@
 %undefine __brp_mangle_shebangs  
 
 Name: systemtap
-Version: 3.2
-Release: 7%{?dist}
+Version: 3.3
+Release: 0.20180222git5ef0c24456e3%{?dist}
 # for version, see also configure.ac
 
-Patch10: rhbz1504009.patch
-Patch11: rhbz1544711.patch
 
 # Packaging abstract:
 #
@@ -114,7 +112,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
+Source: %{name}-%{version}-0.20180222git5ef0c24456e3.tar.gz
 
 # Build*
 BuildRequires: gcc-c++
@@ -480,10 +478,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
 cd ..
 %endif
 
-%patch10 -p1
-
-%patch11 -p1
-
 %build
 
 %if %{with_bundled_elfutils}
@@ -719,6 +713,15 @@ getent passwd stap-server >/dev/null || \
   useradd -c "Systemtap Compile Server" -u 155 -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server 2>/dev/null || \
   useradd -c "Systemtap Compile Server" -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server
 
+%pre testsuite
+getent passwd stapusr >/dev/null || \
+    useradd -c "Systemtap 'stapusr' User" -g stapusr -r -s /sbin/nologin stapusr
+getent passwd stapsys >/dev/null || \
+    useradd -c "Systemtap 'stapsys' User" -g stapsys -G stapusr -r -s /sbin/nologin stapsys
+getent passwd stapdev >/dev/null || \
+    useradd -c "Systemtap 'stapdev' User" -g stapdev -G stapusr -r -s /sbin/nologin stapdev
+exit 0
+
 %post server
 
 # We have some duplication between the %files listings for the
@@ -1160,24 +1163,9 @@ done
 
 # PRERELEASE
 %changelog
-* Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.2-7
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Tue Feb 13 2018 Stan Cox <scox@redhat.com> - 3.2-6
-- rebuilt
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.2-5
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.2-4
-- Fix very old Requires
-
-* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 3.2-3
-- Rebuilt for libjson-c.so.3
-
-* Fri Oct 20 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-2 
-- rhbz1504009 (dtrace -G -o /dev/null)
+* Thu Feb 22 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-0.20180222git5ef0c24456e3
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
 
 * Wed Oct 18 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-1
 - Upstream release.