diff --git a/sddm-systemd-sysusers.conf b/sddm-systemd-sysusers.conf
new file mode 100644
index 0000000..05fcb1c
--- /dev/null
+++ b/sddm-systemd-sysusers.conf
@@ -0,0 +1,2 @@
+#Type Name ID GECOS                  Home directory Shell
+u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
diff --git a/sddm.spec b/sddm.spec
index a78ac1f..e144af7 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -20,7 +20,7 @@
 
 Name:           sddm
 Version:        0.20.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Summary:        QML based desktop and login manager
 
@@ -64,6 +64,12 @@ Source14: README.scripts
 Source15: sddm.sysconfig
 # sddm x11 override config
 Source16:  sddm-x11.conf
+# sysusers config file. note these are shipped in the upstream tarball
+# but we cannot use the files from the tarball for %pre scriptlet
+# generation, so we duplicate them as source files for that purpose;
+# this is an ugly hack that should be removed if it becomes possible.
+# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
+Source17:        sddm-systemd-sysusers.conf
 
 
 Provides: service(graphical-login) = sddm
@@ -196,7 +202,7 @@ cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
 rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
 
 %pre
-%sysusers_create_compat %{SOURCE18}
+%sysusers_create_compat %{SOURCE17}
 
 %post
 %systemd_post sddm.service
@@ -291,6 +297,12 @@ fi
 
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 18 2023 Adam Williamson <awilliam@redhat.com> - 0.20.0-2
+- Fix user/group creation - the config file *has* to be a package source
+
 * Fri Jun 23 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.20.0-1
 - Update to 0.20.0 final