diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index f45696e1b6..07f8b7eb68 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,9 +1,9 @@
 # Template file for 'gcr'
 pkgname=gcr
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-update-mime
+configure_args="$(vopt_enable gir introspection) --disable-update-mime
  --disable-update-icon-cache --disable-schemas-compile"
 hostmakedepends="automake libtool which pkg-config intltool gnome-doc-utils
  libtasn1-tools gettext-devel gnupg perl-XML-Parser glib-devel
@@ -25,13 +25,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 pre_configure() {
 	autoreconf -fi
 }
@@ -42,7 +35,6 @@ post_install() {
 gcr-devel_package() {
 	depends="libglib-devel p11-kit-devel gtk+3-devel gcr>=${version}_${revision}"
 	short_desc+=" - development files"
-	replaces="gnome-keyring-devel<3.3.92"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig