diff --git a/.gitignore b/.gitignore
index 9ea705c..ae546bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /systemtap-3.2.tar.gz
 /systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz
 /systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz
+/systemtap-3.3-0.20180420gitd4a446c.tar.gz
diff --git a/sources b/sources
index 4891a87..66c23da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz) = 47c64c98b711cb32f45fa2971445e85590b2b8fbb7d6223947a8a77531b437eae81848b88ed9eb3b2f05a9582b5f7ad9f5ca028912ac5a868b667f0b1aaba1ba
+SHA512 (systemtap-3.3-0.20180420gitd4a446c.tar.gz) = 3f07bf5f1c1084989ec4f0a72c4f4362b1fbe21568d85802b9a0713e9a99a25e5f73dd4933ad3a0ce7336be1c0a3915a293b36ba1f91003ac6288366f16f0a1f
diff --git a/systemtap.spec b/systemtap.spec
index d8d25c8..908f4d7 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -34,8 +34,8 @@
 %endif
 %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 %{!?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_python2_probes: %global with_python2_probes (0%{?fedora} <= 28 && 0%{?rhel} <= 7)}
+%{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)}
 %{!?with_httpd: %global with_httpd 0}
 
 %ifarch ppc64le aarch64
@@ -77,7 +77,7 @@
 
 Name: systemtap
 Version: 3.3
-Release: 0.20180315gitc2585f2b58cd%{?dist}
+Release: 0.20180420gitd4a446c%{?dist}
 # for version, see also configure.ac
 
 
@@ -112,7 +112,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20180315gitc2585f2b58cd.tar.gz
+Source: %{name}-%{version}-0.20180420gitd4a446c.tar.gz
 
 # Build*
 BuildRequires: gcc-c++
@@ -183,7 +183,11 @@ BuildRequires: pkgconfig(ncurses)
 %endif
 %if %{with_python2_probes}
 BuildRequires: python2-devel
+%if 0%{?fedora} >= 1
 BuildRequires: python2-setuptools
+%else
+BuildRequires: python-setuptools
+%endif
 %endif
 %if %{with_python3_probes}
 BuildRequires: python3-devel
@@ -316,9 +320,13 @@ URL: http://sourceware.org/systemtap/
 %if %{with_python3}
 Requires: python3-pyparsing
 %else
+%if 0%{?rhel} >= 7
+Requires: pyparsing
+%else
 Requires: python2-pyparsing
 %endif
 %endif
+%endif
 
 %description sdt-devel
 This package includes the <sys/sdt.h> header file used for static
@@ -421,6 +429,11 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
+%if ! (%{with_python2_probes})
+# Provide an clean upgrade path when the python2 package is removed
+Obsoletes: %{name}-runtime-python2 < %{version}-%{release}
+%endif
+
 %description runtime-python3
 This package includes support files needed to run systemtap scripts
 that probe python 3 processes.
@@ -1163,6 +1176,10 @@ done
 
 # PRERELEASE
 %changelog
+* Fri Apr 20 2018 Mark Wielaard <mark@klomp.org> - 3.3-0.20180420gitd4a446c
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Thu Mar 15 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-0.20180315gitc2585f2b58cd
 - Automated weekly rawhide release
 - Applied spec changes from upstream git