diff --git a/network/connection/openvpn/actions.py b/network/connection/openvpn/actions.py
index 0f3400147f..6106ed93c8 100644
--- a/network/connection/openvpn/actions.py
+++ b/network/connection/openvpn/actions.py
@@ -57,4 +57,15 @@ def install():
     pisitools.domove("/usr/share/openvpn/sample/sample-keys/*.crt", "/etc/openvpn")
     pisitools.domove("/usr/share/openvpn/sample/sample-keys/*.pem", "/etc/openvpn")
 
+    # EasyRSA
+    pisitools.dobin("EasyRSA-3.1.3/easyrsa")
+    pisitools.insinto("/etc/easy-rsa", "EasyRSA-3.1.3/openssl-easyrsa.cnf")
+    pisitools.insinto("/etc/easy-rsa", "EasyRSA-3.1.3/vars.example", "vars")
+    pisitools.insinto("/etc/easy-rsa/x509-types/", "EasyRSA-3.1.3/x509-types/*")
+
+    shelltools.chmod(get.installDIR() + "/etc/easy-rsa/openssl-easyrsa.cnf", 0644)
+    shelltools.chmod(get.installDIR() + "/etc/easy-rsa/vars", 0644)
+
+    pisitools.dodoc("EasyRSA-3.1.3/ChangeLog", "EasyRSA-3.1.3/COPYING.md")
+
     pisitools.dodoc("COPYING", "COPYRIGHT.GPL", "README*")
diff --git a/network/connection/openvpn/pspec.xml b/network/connection/openvpn/pspec.xml
index b3af877e97..819eed3a33 100644
--- a/network/connection/openvpn/pspec.xml
+++ b/network/connection/openvpn/pspec.xml
@@ -13,7 +13,8 @@
         <PartOf>network.connection</PartOf>
         <Summary>A full featured SSL VPN solution</Summary>
         <Description>OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including remote access, site-to-site VPNs, WiFi security, and enterprise-scale remote access solutions with load balancing, failover, and fine-grained access-controls.</Description>
-        <Archive sha1sum="a94a914cccdc72980729054ae42c6862fcc1c7fc" type="targz">https://swupdate.openvpn.org/community/releases/openvpn-2.6.3.tar.gz</Archive>
+        <Archive sha1sum="34fa805ad1e430ec7f7f2e2ab3fe545b274225a0" type="targz">https://swupdate.openvpn.org/community/releases/openvpn-2.6.4.tar.gz</Archive>
+        <Archive sha1sum="a6f6c769830d7cffe4343de9548d11116c3465e8" type="targz" target="openvpn-2.6.4">https://github.com/OpenVPN/easy-rsa/releases/download/v3.1.3/EasyRSA-3.1.3.tgz</Archive>
         <AdditionalFiles>
             <AdditionalFile permission="0755" target="openvpn-test.sh">openvpn-test.sh</AdditionalFile>
         </AdditionalFiles>
@@ -43,6 +44,9 @@
             <Dependency>libcap-ng</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/usr/bin/easyrsa</Path>
+            <Path fileType="config">/etc/easy-rsa/</Path>
+
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/run/openvpn</Path>
             <Path fileType="man">/usr/share/man</Path>
@@ -64,6 +68,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2023-05-20</Date>
+            <Version>2.6.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2023-04-14</Date>
             <Version>2.6.3</Version>