diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index b384ecd1c55..b11f44c6889 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,11 +1,12 @@
 # Template file for 'gspell'
 pkgname=gspell
 version=1.8.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static
- $(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')"
-hostmakedepends="pkg-config glib-devel $(vopt_if gir 'gobject-introspection vala-devel')"
+configure_args="--disable-static $(vopt_enable gir introspection)
+ $(vopt_enable vala)"
+hostmakedepends="pkg-config glib-devel $(vopt_if gir 'gobject-introspection')
+ $(vopt_if vala 'vala-devel')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
@@ -15,10 +16,10 @@ distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
 checksum=819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5
 
 # Package build options
-build_options="gir"
+build_options="gir vala"
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
+	build_options_default="gir vala"
 fi
 
 gspell-devel_package() {
@@ -28,5 +29,11 @@ gspell-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }