diff --git a/fix-cmake-linking.patch b/fix-cmake-linking.patch
new file mode 100644
index 0000000..1bacc5d
--- /dev/null
+++ b/fix-cmake-linking.patch
@@ -0,0 +1,13 @@
+diff -Nur libfido2-1.7.0/src/CMakeLists.txt new/src/CMakeLists.txt
+--- libfido2-1.7.0/src/CMakeLists.txt	2021-03-29 17:28:56.000000000 +0200
++++ new/src/CMakeLists.txt	2021-04-17 04:08:16.614325721 +0200
+@@ -45,6 +45,9 @@
+ 
+ if(USE_HIDAPI)
+ 	list(APPEND FIDO_SOURCES hid_hidapi.c)
++	if(NOT WIN32 AND NOT APPLE)
++		list(APPEND FIDO_SOURCES hid_unix.c)
++	endif()
+ elseif(WIN32)
+ 	list(APPEND FIDO_SOURCES hid_win.c)
+ elseif(APPLE)
diff --git a/libfido2-1.6.0.tar.gz b/libfido2-1.6.0.tar.gz
deleted file mode 100644
index 1866f6c..0000000
--- a/libfido2-1.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aed47aafd22be49c38f9281fb88ccd08c98678d9b8c39cdc87d1bb3ea2c63e4
-size 413904
diff --git a/libfido2-1.6.0.tar.gz.sig b/libfido2-1.6.0.tar.gz.sig
deleted file mode 100644
index 6e30f28..0000000
Binary files a/libfido2-1.6.0.tar.gz.sig and /dev/null differ
diff --git a/libfido2-1.7.0.tar.gz b/libfido2-1.7.0.tar.gz
new file mode 100644
index 0000000..cb215f4
--- /dev/null
+++ b/libfido2-1.7.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:116749b2a6c95f6559439494fcebdbe803dff14037017ad239843c84c59d708e
+size 517426
diff --git a/libfido2-1.7.0.tar.gz.sig b/libfido2-1.7.0.tar.gz.sig
new file mode 100644
index 0000000..bea772c
Binary files /dev/null and b/libfido2-1.7.0.tar.gz.sig differ
diff --git a/libfido2.changes b/libfido2.changes
index 10df92c..8f2e49a 100644
--- a/libfido2.changes
+++ b/libfido2.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Apr 17 01:41:49 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 1.7.0:
+  * hid_win: detect devices with vendor or product IDs > 0x7fff
+  * Support for FIDO 2.1 authenticator configuration.
+  * Support for FIDO 2.1 UV token permissions.
+  * Support for FIDO 2.1 "credBlobs" and "largeBlobs" extensions.
+  * New API calls
+  * New fido_init flag to disable fido_dev_open’s U2F fallback
+  * Experimental NFC support on Linux.
+- Enabled hidapi again, issues related to hidapi are fixed upstream
+  * Added fix-cmake-linking.patch to fix linking
+
 -------------------------------------------------------------------
 Wed Jan 20 09:46:41 UTC 2021 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/libfido2.spec b/libfido2.spec
index b09773e..47045f3 100644
--- a/libfido2.spec
+++ b/libfido2.spec
@@ -18,20 +18,25 @@
 
 %define sover  1
 Name:           libfido2
-Version:        1.6.0
+Version:        1.7.0
 Release:        0
 Summary:        FIDO U2F and FIDO 2.0 protocols
 License:        BSD-2-Clause
+Group:          Development/Libraries/C and C++
 URL:            https://developers.yubico.com/
 Source0:        https://developers.yubico.com/libfido2/Releases/%{name}-%{version}.tar.gz
 Source1:        https://developers.yubico.com/libfido2/Releases/%{name}-%{version}.tar.gz.sig
+# PATCH-FIX-UPSTREAM fix-cmake-linking.patch -- Fix linking when building with hidapi, gh#323
+Patch0:         fix-cmake-linking.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(hidapi-hidraw)
 BuildRequires:  pkgconfig(libcbor)
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 Provides library functionality for communicating with a FIDO device
@@ -60,6 +65,7 @@ This package contains the header file needed to develop applications that
 use FIDO U2F and FIDO 2.0 protocols.
 
 %package     -n %{name}-utils
+Group:          Hardware/Other
 Summary:        Utility programs making use of libfido2, a library for FIDO U2F and FIDO 2.0
 Conflicts:      libfido2-0_4_0
 Conflicts:      libfido2-1_0_0
@@ -75,14 +81,15 @@ BuildArch:      noarch
 This package contains the udev rules for FIDO2 compatible devices.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 %define __builder ninja
 %cmake \
     -DCBOR_LIBRARY_DIRS=%{_libdir} \
-    -DUSE_HIDAPI=0 \
-    -DBUILD_EXAMPLES=OFF
+    -DBUILD_EXAMPLES=OFF \
+    -DUSE_HIDAPI=ON \
+    -DNFC_LINUX=ON
 %cmake_build
 
 %install