diff --git a/common/hooks/pre-install/98-fixup-gir-path.sh b/common/hooks/pre-install/98-fixup-gir-path.sh
new file mode 100644
index 00000000000..c81c8257294
--- /dev/null
+++ b/common/hooks/pre-install/98-fixup-gir-path.sh
@@ -0,0 +1,12 @@
+# This hook fixes the wrong install path of 'gir' files
+# when cross building packages. It's a workaround and
+# not a proper fix. Remove it once the root cause of the
+# problem is fixed.
+
+hook() {
+	[ -z "$CROSS_BUILD" ] && return
+	if [ -d "${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr" ]; then
+		cp -a "${DESTDIR}"/usr/{${XBPS_CROSS_TRIPLET}/usr/*,}
+		rm -rf "${DESTDIR}"/usr/${XBPS_CROSS_TRIPLET}/usr
+	fi
+}
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 75ce14d508d..e2b9da98fd5 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -39,11 +39,6 @@ post_configure() {
 }
 
 post_install() {
-	if [ "$CROSS_BUILD" ]; then
-		# Move gir-1.0 files erroneously installed in
-		# a ${XBPS_CROSS_TRIPLET}/ prefixed subdir
-		mv -v ${DESTDIR}/usr/{${XBPS_CROSS_TRIPLET}/usr,}/share/gir-1.0
-	fi
 	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
 	vsv polkitd
 }