diff -Nru wlcs-1.4.0-0ubuntu22.10/debian/changelog wlcs-1.4.0-0ubuntu22.10/debian/changelog
--- wlcs-1.4.0-0ubuntu22.10/debian/changelog	2022-05-13 15:37:16.000000000 +0000
+++ wlcs-1.4.0-0ubuntu22.10/debian/changelog	2022-05-13 15:37:16.000000000 +0000
@@ -1,7 +1,8 @@
-wlcs (1.4.0-0ubuntu22.10-2) kinetic; urgency=medium
+wlcs (1.4.0-0ubuntu22.10-3) kinetic; urgency=medium
 
   * Disable sanitizers on riscv64
     Cherry-pick of https://github.com/MirServer/wlcs/commit/c4dd75155e63c9c106639dc2a134f9b0a4169271
+    and https://github.com/MirServer/wlcs/commit/0fc133fb1283d13029def1393de1313274b74615
 
  -- Michał Sawicz <michal.sawicz@canonical.com>  Fri, 13 May 2022 17:37:16 +0200
 
diff -Nru wlcs-1.4.0-0ubuntu22.10/debian/rules wlcs-1.4.0-0ubuntu22.10/debian/rules
--- wlcs-1.4.0-0ubuntu22.10/debian/rules	2022-05-13 15:37:16.000000000 +0000
+++ wlcs-1.4.0-0ubuntu22.10/debian/rules	2022-05-13 15:37:16.000000000 +0000
@@ -26,9 +26,9 @@
   # riscv64 does not have sanitizers
   ifeq ($(DEB_DISTRIBUTION), focal)
     COMMON_CONFIGURE_OPTIONS += -DWLCS_BUILD_ASAN=OFF
-    COMMON_CONFIGURE_OPTIONS += -DWLCS_BUILD_TSAN=OFF
   endif
   COMMON_CONFIGURE_OPTIONS += -DWLCS_BUILD_UBSAN=OFF
+  COMMON_CONFIGURE_OPTIONS += -DWLCS_BUILD_TSAN=OFF
 endif
 
 override_dh_auto_configure: