diff --git a/debian.changelog b/debian.changelog
index d762c9e..fe21ee9 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-system-user-gromox (5-0) unstable; urgency=low
+system-user-gromox (6-0) unstable; urgency=low
 
   * That's it.
 
diff --git a/system-user-gromox.changes b/system-user-gromox.changes
index f4076fe..200a45a 100644
--- a/system-user-gromox.changes
+++ b/system-user-gromox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 14 21:30:34 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 6
+  * Switch back to %sysusers_generate_pre because systemd-sysusers
+    is not present in buildroots.
+
 -------------------------------------------------------------------
 Tue Mar 12 23:54:28 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/system-user-gromox.conf b/system-user-gromox.conf
new file mode 100644
index 0000000..0cf30fc
--- /dev/null
+++ b/system-user-gromox.conf
@@ -0,0 +1,4 @@
+g gromox -
+g gromoxcf -
+u gromox - "Gromox services"
+m gromox gromoxcf
diff --git a/system-user-gromox.spec b/system-user-gromox.spec
index 5bacb9a..a3fddfe 100644
--- a/system-user-gromox.spec
+++ b/system-user-gromox.spec
@@ -17,18 +17,21 @@
 
 
 Name:           system-user-gromox
-Version:        5
+Version:        6
 Release:        0
 Summary:        System user and group gromox
 License:        MIT
 Group:          System/Fhs
-#Source:        https://download.grommunio.com/community/openSUSE_Tumbleweed/system-user-gromox-*.src.rpm
 URL:            https://grommunio.com/
+Source:         system-user-gromox.conf
 BuildArch:      noarch
 BuildRequires:  systemd-rpm-macros
 %if 0%{?suse_version}
-# SUSE doing SUSE things again
 BuildRequires:  sysuser-tools
+%sysusers_requires
+%endif
+%if 0%{?rhel} || 0%{?fedora_version}
+%{?sysusers_requires_compat}
 %endif
 
 %description
@@ -41,18 +44,18 @@ This package provides the gromox account.
 # gromox.spec so that e.g. grommunio-admin-api does not grow a
 # BuildRequire on gromox (wait times).
 #
-cat >u.conf <<-EOF
-	g gromox -
-	g gromoxcf -
-	u gromox - "Gromox services"
-	m gromox gromoxcf
-EOF
+>user.pre
+%if 0%{?suse_version}
+%sysusers_generate_pre %_sourcedir/system-user-gromox.conf user
+%endif
 
 %install
-install -Dpm0644 u.conf "%buildroot/%_sysusersdir/system-user-gromox.conf"
+install -Dpm0644 %_sourcedir/system-user-gromox.conf "%buildroot/%_sysusersdir/system-user-gromox.conf"
 
-%post
-%sysusers_create system-user-gromox.conf
+%pre -f user.pre
+%if 0%{?rhel} || 0%{?fedora_version}
+%sysusers_create_compat %_sourcedir/system-user-gromox.conf
+%endif
 
 %files
 %_sysusersdir/*.conf