diff --git a/.gitignore b/.gitignore
index b2e17e3..32997ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/libcacard-2.6.1.tar.xz
+SOURCES/gpgkey-15B5C33D.gpg
+SOURCES/libcacard-2.7.0.tar.xz
diff --git a/.libcacard.metadata b/.libcacard.metadata
index 6b194a7..0ab9745 100644
--- a/.libcacard.metadata
+++ b/.libcacard.metadata
@@ -1 +1,2 @@
-bceec1a1da4ed95f08bc1307e3a92020fb86f300 SOURCES/libcacard-2.6.1.tar.xz
+edd993b1f57280c50dc15f13624a43849b1c69db SOURCES/gpgkey-15B5C33D.gpg
+85b85d33e5f2c68f3a792f09cae21de64edc91c0 SOURCES/libcacard-2.7.0.tar.xz
diff --git a/SOURCES/libcacard-2.7.0.tar.xz.asc b/SOURCES/libcacard-2.7.0.tar.xz.asc
new file mode 100644
index 0000000..8cfdbde
--- /dev/null
+++ b/SOURCES/libcacard-2.7.0.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEE99xQpX39UrlCUyle9kkHrBW1wz0FAl0154wACgkQ9kkHrBW1
+wz06+Qf/Q6kuvcClfspNnHC6uiG4ltvxC1/56FQXXMOaiwvaR2lrH61po4f16EXI
+fQgjuecTMJukMWwdLFPfR444rfO3vNvaQom953MNI+NoWlzgpl+QoWWvCPJwOUl0
+ocKC7eehtSklbr05X885jHdsabhe4yUxOSJPhFwkiPZLnYGVwyB5gkhM/W9hBKqK
+IkMycN2lW8q+pcjafha9jcSWEa+fzxd+f/78oFwyXB9cPacm0g/LlpNjHZZlnnfn
+X8LVvVeYhMsm9eqY3js2QFOIu2045jBeeg5JwT2scuoMPzWBj8KrMGo8loN0NouZ
+uE7+03F0YKBoyV463bJkyYNryChXZg==
+=Qkcs
+-----END PGP SIGNATURE-----
diff --git a/SPECS/libcacard.spec b/SPECS/libcacard.spec
index 6bb4ea3..025f7f9 100644
--- a/SPECS/libcacard.spec
+++ b/SPECS/libcacard.spec
@@ -1,15 +1,22 @@
 Name:           libcacard
-Version:        2.6.1
+Version:        2.7.0
 Release:        1%{?dist}
 Summary:        CAC (Common Access Card) library
 License:        LGPLv2+
 URL:            http://www.spice-space.org/page/Libcacard
 Source0:        http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz
-Group:          Development/Libraries
+Source1:        http://www.spice-space.org/download/libcacard/%{name}-%{version}.tar.xz.asc
+Source2:        gpgkey-15B5C33D.gpg
 Epoch:          3
 
 BuildRequires:  glib2-devel
 BuildRequires:  nss-devel
+BuildRequires:  softhsm
+BuildRequires:  opensc
+BuildRequires:  gnutls-utils
+BuildRequires:  nss-tools
+BuildRequires:  openssl
+BuildRequires:  gnupg2
 Conflicts:      qemu-common < 2:2.5.0
 
 %description
@@ -28,6 +35,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
 
 %build
@@ -35,6 +43,13 @@ developing applications that use %{name}.
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 
+%check
+# Do not run the tests on s390x, which fails
+%ifnarch s390x
+sed -i "s!/usr/lib64/!%{_libdir}/!" tests/setup-softhsm2.sh
+make check
+%endif
+
 %install
 %make_install
 rm -f %{buildroot}%{_libdir}/*.la
@@ -53,6 +68,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/pkgconfig/libcacard.pc
 
 %changelog
+* Tue Jul 23 2019 Jakub Jelen <jjelen@redhat.com> - 2.7.0-1
+- Update to libcacard 2.7.0 to improve Windows compatibility (#1615840)
+
 * Mon Dec 17 2018 Christophe Fergeau <cfergeau@redhat.com> - 2.6.1-1
 - Update to libcacard 2.6.1
   Resolves: rhbz#1620129