diff --git a/systemd-mini.changes b/systemd-mini.changes
index 94ca8c75..f2787785 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 25 16:30:40 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Allow the sysusers config files shipped by systemd rpms to be
+  overriden during system installation (bsc#1171962)
+
+- While at it, add a comment to explain why we don't use
+  %sysusers_create in %pre and why it should be safe in %post.
+
 -------------------------------------------------------------------
 Thu May 20 20:19:27 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 65aaef57..95c84413 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -865,10 +865,16 @@ fi
 pam-config --add --systemd || :
 %endif
 
-%sysusers_create %{_sysusersdir}/systemd.conf
+# systemd-sysusers is not available in %pre so this needs to be done
+# in %post. However this shouldn't be an issue since all files the
+# main package ships are owned by root.
+%sysusers_create systemd.conf
+
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
+
 systemctl daemon-reexec  || :
+
 %journal_catalog_update
 %tmpfiles_create
 
@@ -1039,7 +1045,8 @@ fi
 %service_add_pre systemd-journal-upload.service
 
 %post journal-remote
-%sysusers_create %{_sysusersdir}/systemd-remote.conf
+# Assume that all files shipped by systemd-journal-remove are owned by root.
+%sysusers_create systemd-remote.conf
 %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
 %service_add_post systemd-journal-remote.socket systemd-journal-remote.service
 %service_add_post systemd-journal-upload.service
diff --git a/systemd.changes b/systemd.changes
index 94ca8c75..f2787785 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 25 16:30:40 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Allow the sysusers config files shipped by systemd rpms to be
+  overriden during system installation (bsc#1171962)
+
+- While at it, add a comment to explain why we don't use
+  %sysusers_create in %pre and why it should be safe in %post.
+
 -------------------------------------------------------------------
 Thu May 20 20:19:27 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index a3170ca4..afe9955d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -863,10 +863,16 @@ fi
 pam-config --add --systemd || :
 %endif
 
-%sysusers_create %{_sysusersdir}/systemd.conf
+# systemd-sysusers is not available in %pre so this needs to be done
+# in %post. However this shouldn't be an issue since all files the
+# main package ships are owned by root.
+%sysusers_create systemd.conf
+
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
+
 systemctl daemon-reexec  || :
+
 %journal_catalog_update
 %tmpfiles_create
 
@@ -1037,7 +1043,8 @@ fi
 %service_add_pre systemd-journal-upload.service
 
 %post journal-remote
-%sysusers_create %{_sysusersdir}/systemd-remote.conf
+# Assume that all files shipped by systemd-journal-remove are owned by root.
+%sysusers_create systemd-remote.conf
 %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
 %service_add_post systemd-journal-remote.socket systemd-journal-remote.service
 %service_add_post systemd-journal-upload.service