diff --git a/libzypp-17.36.1.tar.bz2 b/libzypp-17.36.1.tar.bz2
deleted file mode 100644
index dc6e8d7..0000000
--- a/libzypp-17.36.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88e0e71757b8d2bf2a789ee1e4e149e4ede1dfa4f1202a8f9491f54055769be5
-size 5655034
diff --git a/libzypp-17.36.2.tar.bz2 b/libzypp-17.36.2.tar.bz2
new file mode 100644
index 0000000..b26d74e
--- /dev/null
+++ b/libzypp-17.36.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2848e8c46330369bce1dcd2cf438145f65a54806e1373d54a1b9a2ffd9bfe26
+size 5653053
diff --git a/libzypp.changes b/libzypp.changes
index d9be54b..0eedf3f 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Feb 21 15:08:12 CET 2025 - ma@suse.de
+
+- Filesystem usrmerge must not be done in singletrans mode
+  (bsc#1236481, bsc#1189788)
+  Commit will amend the backend in case the transaction would
+  perform a filesystem usrmerge.
+- Workaround bsc#1216091 on Code16.
+- version 17.36.2 (35)
+
 -------------------------------------------------------------------
 Wed Feb 12 15:58:56 CET 2025 - ma@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index 54b9c8b..47e1cc3 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
+
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 || (0%{?is_opensuse} && 0%{?sle_version} >= 150100)
 %bcond_without zchunk
 %else
@@ -57,7 +59,7 @@
 %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper
 
 Name:           libzypp
-Version:        17.36.1
+Version:        17.36.2
 Release:        0
 License:        GPL-2.0-or-later
 URL:            https://github.com/openSUSE/libzypp
@@ -289,11 +291,11 @@ Developer documentation for libzypp.
 %build
 mkdir build
 cd build
-%if 0%{?suse_version} > 1500
-# Bug 1189788 - UsrMerge: filesystem package breaks system when upgraded in a single rpm transaction
-# While the bug is not fixed, we don't allow ZYPP_SINGLE_RPMTRANS=1 on a not UsrMerged system
-export CFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
-export CXXFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
+%if 0%{?suse_version} == 1600
+# bsc#1216091: rpm-4.18' does not execute 'rpm --runposttrans'
+# scripts chroot if --root is used.
+export CFLAGS="%{optflags} -DWORKAROUNDDUMPPOSTTRANS_BUG_1216091"
+export CXXFLAGS="%{optflags} -DWORKAROUNDDUMPPOSTTRANS_BUG_1216091"
 %else
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"