diff --git a/0001-Temporarily-disable-a-pkcs11-test-case-due-to-bug-in.patch b/0001-Temporarily-disable-a-pkcs11-test-case-due-to-bug-in.patch
new file mode 100644
index 0000000..58fc4c2
--- /dev/null
+++ b/0001-Temporarily-disable-a-pkcs11-test-case-due-to-bug-in.patch
@@ -0,0 +1,32 @@
+From ba424f8dc89ac89430c4f7513a9c82e8a4542e52 Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Thu, 27 Aug 2020 08:28:57 -0400
+Subject: [PATCH] Temporarily disable a pkcs11 test case due to bug in gnutls
+
+GnuTLS on current F33 and rawhide has a locking bug reported here:
+
+https://gitlab.com/gnutls/gnutls/-/issues/1060#note_392260362
+
+Disable the test case that runs into this bug to be able to build
+the package.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8a4a9c2..c88acb4 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -79,7 +79,6 @@ TESTS += \
+ 	test_swtpm_cert \
+ 	test_tpm2_parameters \
+ 	test_tpm2_samples_swtpm_localca \
+-	test_tpm2_samples_swtpm_localca_pkcs11 \
+ 	test_tpm2_swtpm_cert \
+ 	test_tpm2_swtpm_cert_ecc \
+ 	test_tpm2_swtpm_setup_create_cert
+-- 
+2.28.0
+
diff --git a/swtpm.spec b/swtpm.spec
index 46a2bac..0939d91 100644
--- a/swtpm.spec
+++ b/swtpm.spec
@@ -12,11 +12,13 @@
 Summary: TPM Emulator
 Name:           swtpm
 Version:        0.3.4
-Release:        1.%{gitdate}git%{gitshortcommit}%{?dist}
+Release:        2.%{gitdate}git%{gitshortcommit}%{?dist}
 License:        BSD
 Url:            http://github.com/stefanberger/swtpm
 Source0:        %{url}/archive/%{gitcommit}/%{name}-%{gitshortcommit}.tar.gz
 
+Patch0001:      0001-Temporarily-disable-a-pkcs11-test-case-due-to-bug-in.patch
+
 BuildRequires:  git-core
 BuildRequires:  automake
 BuildRequires:  autoconf
@@ -166,6 +168,9 @@ fi
 %attr( 755, tss, tss) %{_localstatedir}/lib/swtpm-localca
 
 %changelog
+* Thu Aug 27 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.3.4-2.20200711git80f0418
+- Disable pkcs11 related test case running into GnuTLS locking bug
+
 * Tue Aug 11 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.3.4-1.20200711git80f0418
 - Update to v0.3.4 release