diff --git a/srcpkgs/libosmgpsmap/template b/srcpkgs/libosmgpsmap/template
index 2836e6fb98b..0dcb57a9072 100644
--- a/srcpkgs/libosmgpsmap/template
+++ b/srcpkgs/libosmgpsmap/template
@@ -1,10 +1,12 @@
 # Template file for 'libosmgpsmap'
 pkgname=libosmgpsmap
 version=1.1.0
-revision=1
+revision=2
 wrksrc=osm-gps-map-${version}
 build_style=gnu-configure
-hostmakedepends="pkg-config gtk-doc gnome-common"
+build_options="gir"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config gtk-doc gnome-common $(vopt_if gir gobject-introspection)"
 makedepends="libsoup-devel gtk+3-devel cairo-devel"
 short_desc="A Gtk+ Widget for Displaying OpenStreetMap tiles"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -13,27 +15,29 @@ homepage="http://nzjrs.github.io/osm-gps-map/"
 distfiles="https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"
 checksum=8f2ff865ed9ed9786cc5373c37b341b876958416139d0065ebb785cf88d33586
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --enable-introspection=no"
-else
-	makedepends+=" gobject-introspection"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
 fi
 
 libosmgpsmap-doc_package() {
+	noarch=yes
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Documentation"
 	pkg_install() {
-		vmove usr/share
+		vmove usr/share/*doc
 	}
 }
 
 libosmgpsmap-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }