diff --git a/.gitignore b/.gitignore
index 3cbf51c..ba1607a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/strongswan-5.7.2.tar.bz2
-/strongswan-5.8.1.tar.bz2
-/strongswan-5.8.2.tar.bz2
+/strongswan-5.8.4.tar.bz2
diff --git a/sources b/sources
index ae79e2c..e5b0e7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (strongswan-5.8.2.tar.bz2) = 423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d
+SHA512 (strongswan-5.8.4.tar.bz2) = 15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103
diff --git a/strongswan.spec b/strongswan.spec
index fa33d30..7d5ce09 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -2,8 +2,8 @@
 #%%define prerelease dr1
 
 Name:           strongswan
-Version:        5.8.2
-Release:        6%{?dist}
+Version:        5.8.4
+Release:        2%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 License:        GPLv2+
 URL:            http://www.strongswan.org/
@@ -12,7 +12,6 @@ Source1:        tmpfiles-strongswan.conf
 Patch0:         strongswan-5.8.4-runtime-dir.patch
 Patch1:         strongswan-5.6.0-uintptr_t.patch
 Patch3:         strongswan-5.6.2-CVE-2018-5388.patch
-Patch4:         strongswan-5.8.2-extern-global.patch
 
 # only needed for pre-release versions
 #BuildRequires:  autoconf automake
@@ -84,7 +83,6 @@ PT-TLS to support TNC over TLS.
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 # only for snapshots
@@ -274,6 +272,13 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
 %{_libexecdir}/strongswan/charon-nm
 
 %changelog
+* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-2
+- Patch0: Add RuntimeDirectory options to service files (#1789263)
+
+* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-1
+- Updated to 5.8.4
+- Patch4 has been applied upstream
+
 * Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-6
 - Patch0: Add RuntimeDirectory options to service files (#1789263)