diff --git a/srcpkgs/google-authenticator-libpam/template b/srcpkgs/google-authenticator-libpam/template
index 476d62b3263..eb4fee56460 100644
--- a/srcpkgs/google-authenticator-libpam/template
+++ b/srcpkgs/google-authenticator-libpam/template
@@ -1,18 +1,22 @@
 # Template file for 'google-authenticator-libpam'
 pkgname=google-authenticator-libpam
-version=1.04
+version=1.05
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pam-devel"
-makedepends=""
-depends=""
-short_desc="PAM module for two-factor authentication."
+short_desc="PAM module for two-factor authentication"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="Apache-2.0"
 homepage="https://github.com/google/google-authenticator-libpam"
 distfiles="https://github.com/google/google-authenticator-libpam/archive/$version.tar.gz"
-checksum=8284cc046be436513d9d4bbb1285017327edbcc32f6f620c47e7e889c4b966ef
+checksum=862412d6927ee1a19d81150006d53c21935897ba6d033616c31fc4d6aaa4db08
+replaces="libpam-google-authenticator>=0"
 
 pre_configure() {
 	autoreconf -fi
 }
+
+do_check() {
+	# Tries to change user to nobody and fails due to being in a user namespace
+	:
+}
diff --git a/srcpkgs/libpam-google-authenticator/template b/srcpkgs/libpam-google-authenticator/template
deleted file mode 100644
index 462def62bb5..00000000000
--- a/srcpkgs/libpam-google-authenticator/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'google-authenticator'
-pkgname=libpam-google-authenticator
-version=1.0.0.20161019
-revision=1
-_pkgname=${pkgname#libpam-}
-_gitrev=9d858ecaad46b40b004fbc1413daa4143c3f10b8
-wrksrc="${_pkgname}-${_gitrev}"
-build_wrksrc="libpam"
-build_style=gnu-configure
-makedepends="pam-devel"
-hostmakedepends="automake libtool pkg-config"
-short_desc="Google's two-factor authentication project"
-maintainer="Sean R. Lang <srlang@ncsu.edu>"
-license="Apache-2.0"
-homepage="https://github.com/google/google-authenticator"
-distfiles="https://github.com/google/${_pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a9325204633c6b5c12aa62c4825f425a9c4da286f2fd9f0f0d06586b76543509
-
-pre_configure() {
-	./bootstrap.sh
-}