diff --git a/.gitignore b/.gitignore
index 03f0cd2..6888c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,5 @@ openvpn-2.1.2.tar.gz.asc
 /openvpn-2.5.6.tar.xz.asc
 /openvpn-2.5.7.tar.xz
 /openvpn-2.5.7.tar.xz.asc
+/openvpn-2.5.8.tar.xz
+/openvpn-2.5.8.tar.xz.asc
diff --git a/openvpn.spec b/openvpn.spec
index 04cc745..1d10c19 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -5,8 +5,8 @@
 %bcond_without tests_long
 
 Name:              openvpn
-Version:           2.5.7
-Release:           3%{?dist}
+Version:           2.5.8
+Release:           1%{?dist}
 Summary:           A full-featured TLS VPN solution
 URL:               https://community.openvpn.net/
 Source0:           https://build.openvpn.net/downloads/releases/%{name}-%{version}.tar.xz
@@ -16,7 +16,6 @@ Source3:           roadwarrior-client.conf
 # Upstream signing key
 Source10:          gpgkey-F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7.gpg
 Patch1:            0001-Change-the-default-cipher-to-AES-256-GCM-for-server-.patch
-Patch2:            0001-Allow-running-a-default-configuration-with-TLS-libra.patch
 Patch50:           openvpn-2.4-change-tmpfiles-permissions.patch
 License:           GPLv2
 BuildRequires:     gnupg2
@@ -78,7 +77,6 @@ to similar features as the various script-hooks.
 gpgv2 --quiet --keyring %{SOURCE10} %{SOURCE1} %{SOURCE0}
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .ch_default_cipher
-%patch2 -p1
 %patch50 -p1
 
 # %%doc items shouldn't be executable.
@@ -203,6 +201,9 @@ done
 
 
 %changelog
+* Tue Nov 1 2022 David Sommerseth <davids@openvpn.net> - 2.5.8-1
+- Update to upstream OpenVPN 2.5.8
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 5236f69..1656a9d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openvpn-2.5.7.tar.xz) = 9a3234b479f5bab12b8c3af7691f175f8cd32f2929dd27efc16e96e14dbb8e07421e623869ad5ffc2d7e65f2266817d1583723033f3646b9913b10ec6d014b44
-SHA512 (openvpn-2.5.7.tar.xz.asc) = 4a1e65acf9fa4a65a310743869515f6c75fbc483c01bfde85027106e64da5fe737c135a88977e8bb1b2b9ccab6790194f06c0de7f4c2c6783be823879ebd140b
+SHA512 (openvpn-2.5.8.tar.xz) = 6588e9525ae4cee04ad9099df3f5e4a1d51a2fceb4609d7352089f7c611ae4792ec056bc84a24ee0d6b91a067b1c88b028aa8f282a7f0e1587f80b7603d8d068
+SHA512 (openvpn-2.5.8.tar.xz.asc) = 931f5ba1f40c51175d9a0ae08ed072569b625b26bb58d2ff41d1d069eddb465515766e6e7437c005c40ad1de5baa619fac16c8335bb0499a535931a20a306bc2