diff --git a/.gitignore b/.gitignore
index 177bc8d..74f3a40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /systemtap-4.6~pre16262021g84ef6bd9.tar.gz
 /systemtap-4.6~pre16291338gf2c14776.tar.gz
 /systemtap-4.6.tar.gz
+/systemtap-4.7~pre16378386g61a4c8f8.tar.gz
diff --git a/sources b/sources
index b4b4a67..5e7eeb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.6.tar.gz) = 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402
+SHA512 (systemtap-4.7~pre16378386g61a4c8f8.tar.gz) = 9dd4e282b108cdc7c552841d8f6b802fb1f1adaf3d48802084eee2db93005a966e8f12f3a86101c8424dff07c2d6b415bd1301f5d30ca7e25d38cb843e59a672
diff --git a/systemtap.spec b/systemtap.spec
index 281a594..8b56e90 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -88,9 +88,37 @@
 # To avoid testsuite/*/*.stp has shebang which doesn't start with '/'
 %define __brp_mangle_shebangs_exclude_from .stp$
 
+%define _systemtap_runtime_preinstall \
+# See systemd-sysusers(8) sysusers.d(5)\
+\
+g     stapusr  156\
+g     stapsys  157\
+g     stapdev  158
+
+%define _systemtap_server_preinstall \
+# See systemd-sysusers(8) sysusers.d(5)\
+\
+g     stap-server  -\
+u     stap-server  -      "systemtap compiler server"   /var/lib/stap-server   /sbin/nologin\
+m     stap-server stap-server
+
+
+%define _systemtap_testsuite_preinstall \
+# See systemd-sysusers(8) sysusers.d(5)\
+\
+u     stapusr  -          "systemtap testsuite user"    /   /sbin/nologin\
+u     stapsys  -          "systemtap testsuite user"    /   /sbin/nologin\
+u     stapdev  -          "systemtap testsuite user"    /   /sbin/nologin\
+m     stapusr  stapusr\
+m     stapsys  stapusr\
+m     stapsys  stapsys\
+m     stapdev  stapusr\
+m     stapdev  stapdev
+
+
 Name: systemtap
-Version: 4.6
-Release: 1%{?release_override}%{?dist}
+Version: 4.7~pre16378386g61a4c8f8
+Release: 2%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -656,9 +684,10 @@ for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
 done
 
 %if %{with_sysusers}
-install -p -D -m 0644 systemtap-runtime.sysusers %{buildroot}%{_sysusersdir}/systemtap-runtime.conf
-install -p -D -m 0644 systemtap-server.sysusers %{buildroot}%{_sysusersdir}/systemtap-server.conf
-install -p -D -m 0644 systemtap-testsuite.sysusers %{buildroot}%{_sysusersdir}/systemtap-testsuite.conf
+mkdir -p %{buildroot}%{_sysusersdir}
+echo '%_systemtap_runtime_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-runtime.conf
+echo '%_systemtap_server_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-server.conf
+echo '%_systemtap_testsuite_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-testsuite.conf
 %endif
 
 
@@ -786,7 +815,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch
 
 %pre runtime
 %if %{with_sysusers}
-%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-runtime.sysusers
+echo '%_systemtap_runtime_preinstall' | systemd-sysusers --replace=%{_sysusersdir}/systemtap-runtime.conf -
 %else
 getent group stapusr >/dev/null || groupadd -f -g 156 -r stapusr
 getent group stapsys >/dev/null || groupadd -f -g 157 -r stapsys
@@ -796,7 +825,7 @@ exit 0
 
 %pre server
 %if %{with_sysusers}
-%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-server.sysusers
+echo '%_systemtap_server_preinstall' | systemd-sysusers --replace=%{_sysusersdir}/systemtap-server.conf -
 %else
 getent group stap-server >/dev/null || groupadd -f -g 155 -r stap-server
 getent passwd stap-server >/dev/null || \
@@ -807,7 +836,7 @@ exit 0
 
 %pre testsuite
 %if %{with_sysusers}
-%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-testsuite.sysusers
+echo '%_systemtap_testsuite_preinstall' | systemd-sysusers --replace=%{_sysusersdir}/systemtap-testsuite.conf -
 %else
 getent passwd stapusr >/dev/null || \
     useradd -c "Systemtap 'stapusr' User" -g stapusr -r -s /sbin/nologin stapusr
@@ -1240,6 +1269,10 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Thu Nov 25 2021 Martin Cermak <mcermak@redhat.com> - 4.7-16378386g61a4c8f8
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Nov 15 2021 Serhei Makarov <me@serhei.io> - 4.6-1
 - Upstream release, see wiki page below for detailed notes.
   https://sourceware.org/systemtap/wiki/SystemTapReleases