diff --git a/.gitignore b/.gitignore
index 9b3e994..1442bfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@
 /systemtap-4.7~pre16432070g1d2cb8b3.tar.gz
 /systemtap-4.7~pre16433134g7d871ab5.tar.gz
 /systemtap-4.7~pre16468670g9f253544.tar.gz
+/systemtap-4.7.tar.gz
diff --git a/sources b/sources
index 0398924..b708a2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.7~pre16468670g9f253544.tar.gz) = 080558dc10f07d97c5fcf2e708b3ae9e73beca749195dd629994974a018d6c7e3383cd503428e9c8430e73aa0ff0b4423695cfd7ff5fee8d1bda4a24e1614ed3
+SHA512 (systemtap-4.7.tar.gz) = 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831
diff --git a/systemtap.spec b/systemtap.spec
index 0a7f6c9..a74d4fb 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -117,8 +117,8 @@ m     stapdev  stapdev
 
 
 Name: systemtap
-Version: 4.7~pre16468670g9f253544
-Release: 2%{?release_override}%{?dist}
+Version: 4.7
+Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -152,7 +152,7 @@ Release: 2%{?release_override}%{?dist}
 Summary: Programmable system-wide instrumentation system
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}.tar.gz
+Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
 # Build*
 BuildRequires: make
@@ -740,6 +740,9 @@ install -m 644 initscript/logrotate.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/lo
 %if %{with_systemd}
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 touch $RPM_BUILD_ROOT%{_unitdir}/systemtap.service
+# RHBZ2070857
+mkdir -p $RPM_BUILD_ROOT%{_presetdir}
+echo 'enable systemtap.service' > $RPM_BUILD_ROOT%{_presetdir}/42-systemtap.preset
 install -m 644 initscript/systemtap.service $RPM_BUILD_ROOT%{_unitdir}/systemtap.service
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sbindir}/systemtap-service
@@ -921,7 +924,8 @@ exit 0
 
 %post initscript
 %if %{with_systemd}
-    /bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
+    # RHBZ2070857 - use systemd presets instead
+    # /bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
 %else
     /sbin/chkconfig --add systemtap
 %endif
@@ -1074,6 +1078,7 @@ exit 0
 %files devel -f systemtap.lang
 %{_bindir}/stap
 %{_bindir}/stap-prep
+%{_bindir}/stap-profile-annotate
 %{_bindir}/stap-report
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
@@ -1174,6 +1179,7 @@ exit 0
 
 %files initscript
 %if %{with_systemd}
+%{_presetdir}/42-systemtap.preset
 %{_unitdir}/systemtap.service
 %{_sbindir}/systemtap-service
 %else
@@ -1269,48 +1275,9 @@ exit 0
 
 # PRERELEASE
 %changelog
-* Fri Apr 01 2022 Richard W.M. Jones <rjones@redhat.com> - 4.7~pre16468670g9f253544-2
-- Bump and rebuild to attempt to fix RHBZ#2070651
-
-* Wed Mar 09 2022 Frank Ch. Eigler <fche@redhat.com> - 4.7-16468670g9f253544
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.7~pre16433134g7d871ab5-2
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 27 2022 William Cohen <wcohen@redhat.com> - 4.7-16433134g7d871ab5
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Jan 27 2022 William Cohen <wcohen@redhat.com> - 4.7-16432070g1d2cb8b3-2
-- Workaround for RHBZ 2047316.
-
-* Wed Jan 26 2022 William Cohen <wcohen@redhat.com> - 4.7-16432070g1d2cb8b3
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.7~pre16395042gefae8a3d-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 Stan Cox <scox@redhat.com> - 4.7-16395042gefae8a3d-2
-- Rebuild for dyninst-12.0.1
-
-* Tue Dec 14 2021 Martin Cermak <mcermak@redhat.com> - 4.7-16395042gefae8a3d
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Dec 07 2021 Frank Ch. Eigler <fche@redhat.com> - 4.7-16388948g209b5a19
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Wed Dec 01 2021 Frank Ch. Eigler <fche@redhat.com> - 4.7-16383943gecab2afe
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Nov 25 2021 Martin Cermak <mcermak@redhat.com> - 4.7-16378386g61a4c8f8
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
+* Mon May 02 2022 Frank Ch. Eigler <fche@redhat.com> - 4.7-1
+- Upstream release, see wiki page below for detailed notes.
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
 
 * Mon Nov 15 2021 Serhei Makarov <me@serhei.io> - 4.6-1
 - Upstream release, see wiki page below for detailed notes.