diff --git a/.gitignore b/.gitignore
index a8ed2dc..df61ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ openconnect-2.25.tar.gz
 /openconnect-7.07.tar.gz.asc
 /openconnect-7.08.tar.gz
 /openconnect-7.08.tar.gz.asc
+/openconnect-8.00.tar.gz
+/openconnect-8.00.tar.gz.asc
diff --git a/openconnect.spec b/openconnect.spec
index a8d0d93..b9433d2 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -1,5 +1,5 @@
-#% define gitcount 211
-#% define gitrev 584c84f
+# % define gitcount 227
+# % define gitrev a03e4bf
 
 %if 0%{?gitcount} > 0
 %define gitsuffix -%{gitcount}-g%{gitrev}
@@ -19,11 +19,18 @@
 %define use_tokens 1
 %endif
 
+# Fedora has tss2-sys from F29 onwards
+%if 0%{?fedora} >= 29
+%define use_tss2_esys 1
+%else
+%define use_tss2_esys 0
+%endif
+
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		openconnect
-Version:	7.08
-Release:	10%{?relsuffix}%{?dist}
+Version:	8.00
+Release:	1%{?relsuffix}%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -39,7 +46,7 @@ Source3:	macros.gpg
 
 BuildRequires:	pkgconfig(libxml-2.0) pkgconfig(libpcsclite) krb5-devel gnupg2
 BuildRequires:	autoconf automake libtool gettext pkgconfig(liblz4)
-BuildRequires:	pkgconfig(uid_wrapper) pkgconfig(socket_wrapper)
+BuildRequires:	pkgconfig(uid_wrapper) pkgconfig(socket_wrapper) softhsm python2
 %if 0%{?fedora} || 0%{?rhel} >= 7
 Obsoletes:	openconnect-lib-compat < %{version}-%{release}
 Requires:	vpnc-script
@@ -47,8 +54,13 @@ Requires:	vpnc-script
 Requires:	vpnc
 %endif
 
+%if 0%{?fedora} >= 30
+BuildRequires: glibc-langpack-cs
+%endif
 %if %{use_gnutls}
 BuildRequires:	pkgconfig(gnutls) trousers-devel
+# Anywhere we use GnuTLS ,there should be an ocserv package too
+BuildRequires:	ocserv
 %else
 BuildRequires:	pkgconfig(openssl) pkgconfig(libp11) pkgconfig(p11-kit-1)
 %endif
@@ -58,10 +70,15 @@ BuildRequires:	pkgconfig(libproxy-1.0)
 %if %{use_tokens}
 BuildRequires:  pkgconfig(stoken) pkgconfig(libpskc)
 %endif
+%if %{use_tss2_esys}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1638961
+BuildRequires: pkgconfig(tss2-esys) libgcrypt-devel
+%endif
 
 %description
-This package provides a client for the Cisco AnyConnect VPN protocol, which
-is based on HTTPS and DTLS.
+This package provides a multiprotocol VPN client for Cisco AnyConnect,
+Juniper SSL VPN / Pulse Connect Secure, and Palo Alto Networks GlobalProtect
+SSL VPN.
 
 %package devel
 Summary: Development package for OpenConnect VPN authentication tools
@@ -87,8 +104,10 @@ for NetworkManager etc.
 
 %build
 %configure	--with-vpnc-script=/etc/vpnc/vpnc-script \
+		--disable-dsa-tests \
+%if %{use_gnutls}
 		--with-default-gnutls-priority="@OPENCONNECT,SYSTEM" \
-%if !%{use_gnutls}
+%else
 		--with-openssl --without-openssl-version-check \
 %endif
 		--htmldir=%{_pkgdocdir}
@@ -102,13 +121,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libopenconnect.la
 %find_lang %{name}
 
 %check
-make check
+make VERBOSE=1 check
 
 %ldconfig_scriptlets
 
 %files -f %{name}.lang
 %{_libdir}/libopenconnect.so.5*
 %{_sbindir}/openconnect
+%{_libexecdir}/openconnect/
 %{_mandir}/man8/*
 %doc TODO COPYING.LGPL
 %doc %{_pkgdocdir}
@@ -119,6 +139,9 @@ make check
 %{_libdir}/pkgconfig/openconnect.pc
 
 %changelog
+* Sat Jan 05 2019 David Woodhouse <dwmw2@infradead.org> - 8.00-1
+- Update to 8.00 release
+
 * Wed Nov 07 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 7.08-9
 - Corrected typo in the @OPENCONNECT priority string
 
diff --git a/sources b/sources
index b68845d..3df93b1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openconnect-7.08.tar.gz) = 22f9b0bd4bd17e2ab91ff42b2464c89abba035fe705c037ba4d1042ace460c8738e20481783a1edc3b7dd6503fe9fcc7fdd188552811fb1525310e25a4c2f400
-SHA512 (openconnect-7.08.tar.gz.asc) = 71225434890bdc9f4ae1f6aaf38037418766f39d8dc549da1ae95b12676c47bd503c7c01a5ccb387a1d36c114aad690ddf01682ec7b24d23fbec7e2d628b0a25
+SHA512 (openconnect-8.00.tar.gz) = c8d104d001fbecf482499814d7a77d02f6a50dfdd7bda36f10b053ae0bf8cd6eb7a88773f12a582e63e82339592d40f34d154c43bc118957930f73ef09def9a3
+SHA512 (openconnect-8.00.tar.gz.asc) = 4693e8ec5ed84727aa18d9f8ffed8093f78956555fc42ce027cff9e87952dd914184350855742dd07a08c98ce5c7482f4d37c19589935dd54e1279b3719cc2c9