diff --git a/srcpkgs/uhttpmock/template b/srcpkgs/uhttpmock/template
index 385c75880b2..a95c563d46c 100644
--- a/srcpkgs/uhttpmock/template
+++ b/srcpkgs/uhttpmock/template
@@ -1,10 +1,11 @@
 # Template file for 'uhttpmock'
 pkgname=uhttpmock
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="glib-devel libsoup-devel"
+build_helper="gir"
+hostmakedepends="pkg-config $(vopt_if gir 'gobject-introspection vala')"
+makedepends="glib-devel libsoup-devel $(vopt_if gir 'gobject-introspection vala')"
 short_desc="HTTP web service mocking project for projects which use libsoup"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1"
@@ -12,6 +13,16 @@ homepage="https://gitlab.com/uhttpmock/uhttpmock"
 distfiles="http://tecnocode.co.uk/downloads/uhttpmock/$pkgname-$version.tar.xz"
 checksum=a6a34a011db142a98473b492039c84468d575f416689484f1f82a84927f17798
 
+build_options="gir"
+build_options_default="gir"
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		# Make g-ir-scanner-qemuwrapper append this path
+		export LD_LIBRARY_PATH="${wrksrc}/libuhttpmock/.libs"
+	fi
+}
+
 uhttpmock-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
@@ -21,5 +32,9 @@ uhttpmock-devel_package() {
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 		vmove usr/share/gtk-doc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }