diff --git a/.gitignore b/.gitignore
index fb1c48c..288f655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,6 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.5.9-hobbled.tar.xz
 /gnutls-3.5.10-hobbled.tar.xz
 /gnutls-3.5.11-hobbled.tar.xz
+/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+/gnutls-3.5.12.tar.xz.sig
+/gnutls-3.5.12.tar.xz
diff --git a/gnutls.spec b/gnutls.spec
index ef33cd5..5c4e84f 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:	3.5.11
+Version:	3.5.12
 Release: 1%{?dist}
 Patch1:	gnutls-3.2.7-rpath.patch
 Patch2:	gnutls-3.4.2-no-now-guile.patch
@@ -22,7 +22,7 @@ BuildRequires: gperf, net-tools, datefudge, softhsm
 # for a sanity check on cert loading
 BuildRequires: p11-kit-trust, ca-certificates
 Requires: crypto-policies
-Requires: p11-kit-trust
+Requires: p11-kit-trust%{?_isa}
 Requires: libtasn1 >= 4.3
 Recommends: trousers >= 0.3.11.2
 
@@ -33,10 +33,9 @@ BuildRequires: unbound-devel unbound-libs
 BuildRequires: guile-devel
 %endif
 URL: http://www.gnutls.org/
-#Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/%{name}-%{version}.tar.xz
-#Source1: ftp://ftp.gnutls.org/gcrypt/gnutls/%{name}-%{version}.tar.xz.sig
-# XXX patent tainted code removed.
-Source0: %{name}-%{version}-hobbled.tar.xz
+Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/%{name}-%{version}.tar.xz
+Source1: ftp://ftp.gnutls.org/gcrypt/gnutls/%{name}-%{version}.tar.xz.sig
+Source2: gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -134,13 +133,12 @@ This package contains Guile bindings for the library.
 %endif
 
 %prep
+gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+
 %setup -q
 %patch1 -p1
 %patch2 -p1
 
-sed 's/gnutls_srp.c//g' -i lib/Makefile.in
-sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
-sed 's/global_init/gnutls_global_init/g' -i tests/trust-store.c
 sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
 rm -f lib/minitasn1/*.c lib/minitasn1/*.h
 rm -f src/libopts/*.c src/libopts/*.h src/libopts/compat/*.c src/libopts/compat/*.h 
@@ -151,7 +149,6 @@ echo "SYSTEM=NORMAL" >> tests/system.prio
 %configure --with-libtasn1-prefix=%{_prefix} \
            --disable-static \
            --disable-openssl-compatibility \
-           --disable-srp-authentication \
            --disable-non-suiteb-curves \
            --with-system-priority-file=%{_sysconfdir}/crypto-policies/back-ends/gnutls.config \
            --with-default-trust-store-pkcs11="pkcs11:" \
@@ -176,9 +173,6 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 make -C doc install-html DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_bindir}/srptool
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls*.a
@@ -249,6 +243,7 @@ fi
 %{_bindir}/ocsptool
 %{_bindir}/psktool
 %{_bindir}/p11tool
+%{_bindir}/srptool
 %if %{with dane}
 %{_bindir}/danetool
 %endif
@@ -273,6 +268,9 @@ fi
 %endif
 
 %changelog
+* Thu May 11 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.5.12-1
+- Update to upstream 3.5.12 release
+
 * Fri Apr 07 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.5.11-1
 - Update to upstream 3.5.11 release
 
diff --git a/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg b/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
new file mode 100644
index 0000000..1f9a40c
Binary files /dev/null and b/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg differ
diff --git a/sources b/sources
index be18ad8..d4a80eb 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (gnutls-3.5.11-hobbled.tar.xz) = b47b9c6f270454ba626ca17b81c638993563ae6a9c6444e4e2392ee03c5673b790ab7cba52bab58bc1fa4b88bacc44ff11df26e4fc3c727eeb5624c3af8dcd38
+SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 7eccc70fb763cf8a6525228230c1f537224809cf553efb3ad6bc88ad96f01122c30a5cd9d8328fa3a97b242d59e00bc9966589a24b1e65dd4a27eb71393f097c
+SHA512 (gnutls-3.5.12.tar.xz.sig) = 62b618e9fcfbb873960177800254d83c1e26899d433425b3aa22f37976464273b0b40cf17923c39e7ae15d90f325f88d5ea885a32394353d268c4b9c16744581
+SHA512 (gnutls-3.5.12.tar.xz) = 8fec23e7e494a2e15e0f938115cae1ba3fee952d634db387f983b01096f68ca4313b23bc4c439d3c7fdd07c861eac4913a7c2343c8704961588ae195886ec90c