diff --git a/.gitignore b/.gitignore
index 29f4d31..00bca54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /NetworkManager-l2tp-1.2.14.tar.xz
 /NetworkManager-l2tp-1.2.16.tar.xz
 /NetworkManager-l2tp-1.8.0.tar.xz
+/NetworkManager-l2tp-1.8.2.tar.xz
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 3c3f03a..70009a8 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -1,12 +1,6 @@
-%if 0%{?fedora} < 28 && 0%{?rhel} < 8
-%bcond_without libnm_glib
-%else
-%bcond_with libnm_glib
-%endif
-
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
-Version:   1.8.0
+Version:   1.8.2
 Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://github.com/nm-l2tp/NetworkManager-l2tp
@@ -16,27 +10,19 @@ Source:    https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/%{ve
 
 BuildRequires: glib2-devel
 BuildRequires: gtk3-devel
-BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
-BuildRequires: libnma-devel >= 1.2.0
+BuildRequires: NetworkManager-libnm-devel >= 1:1.8.0
+BuildRequires: libnma-devel >= 1.8.0
 BuildRequires: ppp-devel
 BuildRequires: libtool intltool gettext
 BuildRequires: libsecret-devel
-%if %with libnm_glib
-BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
-BuildRequires: libnm-gtk-devel >= 1.2.0
-%endif
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 1:1.1.0
 BuildRequires: nss-devel
 
 Requires: dbus
-Requires: NetworkManager >= 1:1.2.0
+Requires: NetworkManager >= 1:1.8.0
 Requires: ppp = %{ppp_version}
 Requires: xl2tpd
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-Requires: libreswan
-%else
-Recommends: libreswan
-%endif
+Recommends: (libreswan or strongswan)
 
 %global __provides_exclude ^libnm-.*\\.so
 
@@ -62,8 +48,8 @@ if [ ! -f configure ]; then
 fi
 %configure \
     --disable-static \
-%if %with libnm_glib
-    --with-libnm-glib \
+%if 0%{?rhel} == 8
+    --enable-libreswan-dh2 \
 %endif
     --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
     --with-dist-version=%{version}-%{release}
@@ -107,12 +93,27 @@ exit 0
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
 %{_datadir}/appdata/network-manager-l2tp.metainfo.xml
 
-%if %with libnm_glib
-%{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
-%{_libdir}/NetworkManager/libnm-*-properties.so
-%endif
-
 %changelog
+* Sun Apr 12 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.2-1
+- Updated to 1.8.2 release
+- Remove redundant patches
+- Remove redundant libnm_glib conditionals as can not be built with RHEL < 8
+- Correct BuildRequires version dependencies
+- Use --enable-libreswan-dh2 configure switch with RHEL8
+- Recommends (libreswan or strongswan) instead of just libreswan
+
+* Thu Feb 27 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.0-5
+- Patch for user certificate support fix
+
+* Wed Feb 26 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.0-4
+- Patch to support libreswan 3.30 which is no longer built with modp1024 support
+
+* Sat Feb 22 2020 Adam Williamson <awilliam@redhat.com> - 1.8.0-3
+- Rebuild for new ppp
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Dec 13 2019 Douglas Kosovic <doug@uq.edu.au> - 1.8.0-1
 - Updated to 1.8.0 release
 
diff --git a/sources b/sources
index e2d4cb8..4088c20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-l2tp-1.8.0.tar.xz) = 8ef6732dbef2d24a51c6f70bcd98b272244dfc4d89e888e0d2c6c12b0042c1bcc750b73cdfda3489f4987af4fe85df4fc54976c48151996aa205939671d250da
+SHA512 (NetworkManager-l2tp-1.8.2.tar.xz) = fc7f4037a4e2d442231f3c72692b7d405f13507625828dc4b975fab3717c7c0daaeaa757ef2ed875f347a87ac4ccaf5a0df1834235d8879f3d1e0d1b450531b8