diff --git a/macros.sysusers b/macros.sysusers
index 6eaa325..580e624 100644
--- a/macros.sysusers
+++ b/macros.sysusers
@@ -18,7 +18,7 @@
 #
 ###
 
-%sysusers_requires	Requires(pre): sysuser-shadow
+%sysusers_requires	Requires(pre): sysuser-shadow >= 3.1
 
 %sysusers_generate_pre()	\
 %{_prefix}/lib/rpm/sysusers-generate-pre  "%1" "%3" > "%2".pre
diff --git a/sysuser-tools.changes b/sysuser-tools.changes
index 226b8dc..8e78abc 100644
--- a/sysuser-tools.changes
+++ b/sysuser-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 21 09:56:17 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Bump version up to 3.1. The --replace parameter only appeared in
+  systemd 238, so we need to ensure to get the update order correct
+  for sysuser-generate when using the 3rd command line parameters:
+  * systemd -> sysuser-tools -> system-{user|group}-FOO.
+- Add Conflicts systemd < 238 to sysuser-shadow
+- update sysuser_requires to request sysuser-shadow 3.1
+
 -------------------------------------------------------------------
 Mon Jun  7 11:11:27 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/sysuser-tools.spec b/sysuser-tools.spec
index a8505a0..c1ec278 100644
--- a/sysuser-tools.spec
+++ b/sysuser-tools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           sysuser-tools
-Version:        3.0
+Version:        3.1
 Release:        0
 Summary:        Auto provides for system users
 License:        MIT
@@ -41,6 +41,8 @@ Group:          System/Packages
 Requires(pre):  (/usr/sbin/useradd or busybox)
 # prefer original shadow over busybox by default
 Suggests:       shadow
+Conflicts:      systemd < 238
+Requires:       (systemd >= 238 if systemd)
 
 %description -n sysuser-shadow
 This package contians a tool, which expects as input a sysusers.d