diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index e9c424659b2..31269530385 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,10 +1,11 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.112
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-systemd=yes --with-authfw=pam
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
+ --with-systemdsystemunitdir=/usr/lib/systemd/system --with-os-type=void
+ --with-mozjs=mozjs-17.0 --enable-libsystemd-login=yes"
 short_desc="Authorization Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/polkit"
@@ -12,28 +13,57 @@ license="GPL-2"
 distfiles="http://www.freedesktop.org/software/polkit/releases/polkit-${version}.tar.gz"
 checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
 
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
-makedepends="glib-devel expat-devel pam-devel systemd-devel js-devel shadow"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+makedepends="libglib-devel expat-devel pam-devel systemd-devel mozjs17-devel shadow"
 depends="shadow"
 system_accounts="polkitd"
 
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection"
+else
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -fi
+	fi
 	# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
 	sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
 }
 
+post_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		sed -e "s,/usr/include/js-17.0,${XBPS_CROSS_BASE}/usr/include/js-17.0," -i src/polkitbackend/Makefile
+	fi
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
 	vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf
 }
 
 polkit-devel_package() {
-	depends="libglib-devel polkit>=${version}"
+	depends="libglib-devel polkit>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 		vmove "usr/lib/*.so"
 	}
 }