diff --git a/systemd.changes b/systemd.changes
index 69e7e057..fb4b065b 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,12 +1,26 @@
+-------------------------------------------------------------------
+Tue Jun 27 13:02:40 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Change the group owner of /run/lock from "lock" to "root" (bsc#1212674)
+
+  This allows to drop the dependency "Requires: group(lock)" that was introduced
+  previously to make sure that the "lock" group will be kept around. This
+  dependency introduced a dependency cycle.
+
+-------------------------------------------------------------------
+Mon Jun 26 14:26:28 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- file-triggers: fix a typo that sneaked in the script dealing with tmpfiles
+  (bsc#1212733)
+
 -------------------------------------------------------------------
 Wed Jun 21 10:30:58 UTC 2023 - Franck Bui <fbui@suse.com>
 
-- Make sure to pre-install the groups systemd and udev rely on. This is needed
-  when the tmpfiles are run at package installation time. Theoretically with
-  only "Requires(pre): group()", rpm is allowed to drop the group at the end of
-  the package installations hence let's keep "Requires: group()" dep.
+- Make sure to keep the groups systemd and udev rely on installed. Theoretically
+  with only "Requires(pre): group(x)", rpm is allowed to drop group 'x' at the
+  end of the package installations.
 
-  Note: this is also needed when (post)file-triggers are enabled due to the
+  Note: this is also needed when (trans)file-triggers are enabled due to the
   current limitation of the default libzypp transaction backend.
 
 -------------------------------------------------------------------
diff --git a/systemd.spec b/systemd.spec
index 7aeb2d5f..59bfa038 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -137,10 +137,6 @@ Requires:       netcfg >= 11.5
 Requires:       systemd-default-settings-branding
 Requires:       systemd-presets-branding
 Requires:       util-linux >= 2.27.1
-Requires:       group(lock)
-# The next dependency is also needed with file-triggers enabled due to the way
-# the libzypp default transaction backend works.
-Requires(pre):  group(lock)
 Requires(post): coreutils
 Requires(post): findutils
 Requires(post): systemd-presets-branding
diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf
index 90da5b70..74acc896 100644
--- a/tmpfiles-suse.conf
+++ b/tmpfiles-suse.conf
@@ -6,8 +6,8 @@
 # Legacy symlink. Maybe should be owned by util-linux ?
 L+ /etc/mtab - - - - ../proc/self/mounts
 
-# FIXME: Might be moved to lockded.
-d /run/lock 0775 root lock -
+# FIXME: move to filesystem ?
+d /run/lock 0775 root root -
 
-# FIXME: Should these one be moved to shadow ?
+# FIXME: Move to shadow ?
 f /var/log/wtmp 0664 root utmp -
diff --git a/triggers.systemd b/triggers.systemd
index 5a0e6c16..3d1095e5 100644
--- a/triggers.systemd
+++ b/triggers.systemd
@@ -108,7 +108,7 @@ end
 -- Note: /run is never mounted during transactional updates.
 if posix.access("/run/systemd/system") then
     assert(rpm.execute("systemd-tmpfiles", "--create"))
-endf
+end
 
 %if %{without bootstrap}
 %transfiletriggerin -P 1000600 -n udev -p <lua> -- /usr/lib/udev/rules.d