diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index e6b05a7a2a6..e78b2a70483 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,31 +1,28 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
-version=1.4.0
+version=1.4.2
 revision=1
+build_options="gir systemd"
 build_style=gnu-configure
-configure_args="--disable-static --sbindir=/usr/bin --with-udev-base-dir=/usr/lib/udev --with-polkit=permissive"
-hostmakedepends="pkg-config intltool glib-devel"
+configure_args="--disable-static --sbindir=/usr/bin
+ --with-udev-base-dir=/usr/lib/udev --with-polkit=permissive
+ $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config intltool glib-devel
+ $(vopt_if gir 'vala-devel gobject-introspection')"
 makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel
- libmbim-devel>=1.10 ppp libqmi-devel>=1.10.2"
+ libmbim-devel>=1.10 ppp libqmi-devel>=1.10.2 $(vopt_if systemd systemd-devel)"
 depends="hicolor-icon-theme ppp"
-systemd_services="${pkgname}.service on"
 short_desc="Mobile broadband modem management service"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/ModemManager/"
 license="GPL-2"
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
-checksum=efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0
+checksum=07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d
 
-build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
-	makedepends+=" systemd-devel"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
 fi
 
-pre_configure() {
-	sed -e 's,-Werror,,g' -i configure
-}
-
 ModemManager-devel_package() {
 	depends="libmm-glib>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -33,12 +30,18 @@ ModemManager-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }
-
 libmm-glib_package() {
 	short_desc+=" - GLib library"
 	pkg_install() {
 		vmove "usr/lib/libmm-glib.so.*"
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 	}
 }