diff --git a/.gitignore b/.gitignore
index fc9bb91..2cc15d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /libcacard-2.8.0.tar.xz
 /libcacard-2.8.0.tar.xz.asc
 /gpgkey-E37A484F.gpg
+/libcacard-20210801.tar.xz
diff --git a/libcacard-2.8.0-32bit.patch b/libcacard-2.8.0-32bit.patch
deleted file mode 100644
index 6f38e32..0000000
--- a/libcacard-2.8.0-32bit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/setup-softhsm2.sh b/tests/setup-softhsm2.sh
-index 7523990..5341cd3 100755
---- a/tests/setup-softhsm2.sh
-+++ b/tests/setup-softhsm2.sh
-@@ -8,6 +8,7 @@ PIN="77777777"
- export GNUTLS_PIN=$PIN
- 
- for P11LIB in \
-+        /usr/lib/pkcs11/libsofthsm2.so \
-         /usr/lib64/pkcs11/libsofthsm2.so \
-         /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so \
-         /usr/lib/softhsm/libsofthsm2.so \
diff --git a/libcacard.spec b/libcacard.spec
index bc78995..5add1d6 100644
--- a/libcacard.spec
+++ b/libcacard.spec
@@ -1,14 +1,13 @@
+%global gitdate 20210801
+%global gitversion cf6121deb4
+
 Name:           libcacard
 Version:        2.8.0
-Release:        3%{?dist}
+Release:        4.%{gitdate}git%{gitversion}%{?dist}
 Summary:        CAC (Common Access Card) library
 License:        LGPLv2+
 URL:            https://gitlab.freedesktop.org/spice/libcacard
-Source0:        http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz
-Source1:        http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz.asc
-Source2:        gpgkey-E37A484F.gpg
-# https://gitlab.freedesktop.org/spice/libcacard/-/merge_requests/24
-Patch0:         libcacard-2.8.0-32bit.patch
+Source0:	    libcacard-%{gitdate}.tar.xz
 Epoch:          3
 
 BuildRequires:  gcc
@@ -41,9 +40,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{gitdate}
 
 %build
 %meson
@@ -57,7 +54,6 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 
 %install
 %meson_install
-rm -f %{buildroot}%{_libdir}/*.la
 
 %ldconfig_scriptlets
 
@@ -72,6 +68,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/pkgconfig/libcacard.pc
 
 %changelog
+* Sun Aug  8 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 3:2.8.0-4.20210801gitcf6121deb4
+- Update to git snapshot v2.8.0.22
+- Fix FTBFS rhbz#1987641
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:2.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..301924e
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=libcacard-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	https://gitlab.freedesktop.org/spice/libcacard.git $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| xz > $DIRNAME.tar.xz
+
+# rm -rf $DIRNAME
diff --git a/sources b/sources
index 5599e17..16ff988 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (libcacard-2.8.0.tar.xz) = 68a7ef8446995b8495f23656d481ed8accc451412561dac9b2397b34accaf88c44499bc753de2e56ae22a07af81594a29b4e47fa9418a2f97c33804e3c6b9da3
-SHA512 (libcacard-2.8.0.tar.xz.asc) = fffe6a236276cd01bcdd1962e17d2b1b3f5450aae4848b3640808faabcf5e93a3c8ec394b335ccd21cebdcca5129859cfe52c2f7c69f8a3c37763c3844311d5e
-SHA512 (gpgkey-E37A484F.gpg) = 091755da8a358c8c8ebd3b5443b4b5eb3c260afed943454c085d48c973de6a42763547c321c64e4da5c1b2983ad0c5146aaeddeb1d54ef414f7e6a530a3bf14a
+SHA512 (libcacard-20210801.tar.xz) = 82f4314a725ec1b6e230b382e0a9b3014974b9545f932ab70d20c32118bc406aa662161314f7b3837bff0878d4d5dec7327c7c4962f49356d869187cd7a3286c