diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 07c0d22c3b2..488dc55f0cd 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,12 +1,12 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.11.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --disable-fatal-warnings
  --disable-libsocialweb-backend --disable-schemas-compile
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool vala-devel
+ $(vopt_enable vala vapigen)"
+hostmakedepends="pkg-config intltool $(vopt_if vala vala-devel)
  $(vopt_if gir gobject-introspection)"
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel tracker-devel"
@@ -18,9 +18,9 @@ homepage="https://wiki.gnome.org/Projects/Folks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a7b03ed30373e29f62fc3e6f498adce2d4909b852608fc2058a02fda9f80189a
 
-build_options="gir"
+build_options="gir vala"
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
+	build_options_default="gir vala"
 fi
 
 folks-devel_package() {
@@ -30,7 +30,9 @@ folks-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/vala
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi