diff --git a/cross/dbus/Makefile b/cross/dbus/Makefile
index ae44780a145..1a67c4302d6 100644
--- a/cross/dbus/Makefile
+++ b/cross/dbus/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = dbus
-PKG_VERS = 1.12.22
-PKG_EXT = tar.gz
+PKG_VERS = 1.13.22
+PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://dbus.freedesktop.org/releases/dbus
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
@@ -8,10 +8,8 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 DEPENDS = cross/libexpat
 
 HOMEPAGE = https://www.freedesktop.org/wiki/Software/dbus/
-COMMENT  = D-Bus is a message bus system, a simple way for applications to talk to one another.
-LICENSE  = GPLv2
-
-CMAKE_DIR = $(WORK_DIR)/$(PKG_DIR)/cmake
+COMMENT = D-Bus is a message bus system, a simple way for applications to talk to one another.
+LICENSE = Academic Free License v2.1 or GPLv2
 
 CMAKE_ARGS += -DDBUS_BUILD_TESTS=OFF
 CMAKE_ARGS += -DDBUS_ENABLE_XML_DOCS=OFF
diff --git a/cross/dbus/PLIST b/cross/dbus/PLIST
index 2934bd94554..dcd1cfcbe45 100644
--- a/cross/dbus/PLIST
+++ b/cross/dbus/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/libdbus-1.so
 lnk:lib/libdbus-1.so.3
-lib:lib/libdbus-1.so.3.19.14
+lib:lib/libdbus-1.so.3.31.0
diff --git a/cross/dbus/digests b/cross/dbus/digests
index 50125ebdba9..7090fc15b38 100644
--- a/cross/dbus/digests
+++ b/cross/dbus/digests
@@ -1,3 +1,3 @@
-dbus-1.12.22.tar.gz SHA1 eb2590a18c7edc842084db15b2f7f3cfaeb1c6a6
-dbus-1.12.22.tar.gz SHA256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474
-dbus-1.12.22.tar.gz MD5 c6430ac3be48162b1b62a92d99a1d448
+dbus-1.13.22.tar.xz SHA1 9f6bf1922a550281481ee67fdff7212dc95c5562
+dbus-1.13.22.tar.xz SHA256 fbe79fa621ccc01317032bd0d6a31542df429b5c293e075620e2c00fbf2e9c17
+dbus-1.13.22.tar.xz MD5 5e7616495162394f811220555ec3d53b
diff --git a/cross/dbus/patches/000-remove-warnings-not-known-by-gcc.patch b/cross/dbus/patches/000-remove-warnings-not-known-by-gcc.patch
new file mode 100644
index 00000000000..9ed2974fef1
--- /dev/null
+++ b/cross/dbus/patches/000-remove-warnings-not-known-by-gcc.patch
@@ -0,0 +1,56 @@
+# remove warnings (some are introduced with dbus v1.13.22)
+# remove warnings unknown by older gcc:
+# - double-promotion
+# - jump-misses-init
+# - unused-but-set-variable
+# remove warnings unknown by gcc of DSM 6 toolchains:
+# - duplicated-branches
+# - duplicated-cond
+# - null-dereference
+# - restrict
+# ignore further warnings
+# - inline
+# 
+--- CMakeLists.txt.orig	2022-02-21 15:28:30.000000000 +0000
++++ CMakeLists.txt	2023-05-20 14:23:18.386712356 +0000
+@@ -281,9 +281,6 @@
+         cast-align
+         char-subscripts
+         declaration-after-statement
+-        double-promotion
+-        duplicated-branches
+-        duplicated-cond
+         extra
+         float-equal
+         format-nonliteral
+@@ -291,8 +288,6 @@
+         format=2
+         implicit-function-declaration
+         init-self
+-        inline
+-        jump-misses-init
+         logical-op
+         missing-declarations
+         missing-format-attribute
+@@ -306,13 +301,11 @@
+         no-missing-field-initializers
+         no-unused-label
+         no-unused-parameter
+-        null-dereference
+         old-style-definition
+         packed
+         pointer-arith
+         pointer-sign
+         redundant-decls
+-        restrict
+         return-type
+         shadow
+         sign-compare
+@@ -321,7 +314,6 @@
+         switch-default
+         switch-enum
+         undef
+-        unused-but-set-variable
+         write-strings
+     )
+     set(WARNINGS_C
diff --git a/cross/opus/Makefile b/cross/opus/Makefile
index ee76a2c0a39..c924e2af761 100644
--- a/cross/opus/Makefile
+++ b/cross/opus/Makefile
@@ -14,9 +14,6 @@ LICENSE  = BSD
 GNU_CONFIGURE = 1
 
 CONFIGURE_ARGS = --disable-doc --disable-extra-programs
-
-ifeq ($(findstring $(ARCH),comcerto2k),$(ARCH))
-ADDITIONAL_CFLAGS = -D_FORTIFY_SOURCE=0
-endif
+ADDITIONAL_CPPFLAGS = -O2
 
 include ../../mk/spksrc.cross-cc.mk