diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 3286e47d91..3cceb34680 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -7,8 +7,9 @@ build_helper="gir"
 configure_args="--disable-static --with-polkit=permissive
  --with-udev-base-dir=/usr/lib/udev $(vopt_enable gir introspection)
  $(vopt_enable gir vala)"
-hostmakedepends="pkg-config autoconf"
-makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel
+hostmakedepends="pkg-config autoconf $(vopt_if gir vala-devel)
+ glib-devel libxslt-devel"
+makedepends="libglib-devel libgudev-devel polkit-devel libqmi-devel
  libmbim-devel libxslt-devel ppp $(vopt_if gir vala-devel)"
 depends="hicolor-icon-theme ppp"
 checkdepends="dbus tzdata"
@@ -22,10 +23,6 @@ checksum=783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd
 build_options="gir"
 build_options_default="gir"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" glib-devel libxslt-devel"
-fi
-
 pre_configure() {
 	# Werror ___Guarantees___ failure to build for any non-trivial project
 	# in any machine that doesn't run the same software as upstream
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index dfb7d61b43..1f2e4acb7d 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,17 +1,25 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.22.0
+version=1.24.4
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="glib-devel pkg-config"
-makedepends="libgudev-devel"
+build_helper=gir
+configure_args="--disable-static $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libgudev-devel"
 short_desc="MBIM modem protocol helper library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38
+checksum=dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285
+
+build_options="gir"
+build_options_default="gir"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" glib-devel"
+fi
 
 libmbim-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"