diff --git a/Fix-broken-kcfgc-files.patch b/Fix-broken-kcfgc-files.patch
deleted file mode 100644
index 5d17e48..0000000
--- a/Fix-broken-kcfgc-files.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 28 Oct 2016 12:16:17 +0000
-Subject: Fix broken kcfgc files
-X-Git-Url: http://quickgit.kde.org/?p=oxygen.git&a=commitdiff&h=eb6ba888913283f74de5e2172e872bc9d3f983a7
----
-Fix broken kcfgc files
-
-They need to refer to the kcfg file, not to themselves...
----
-
-
---- a/kdecoration/oxygensettings.kcfgc
-+++ b/kdecoration/oxygensettings.kcfgc
-@@ -1,4 +1,4 @@
--File=oxygensettingsdata.kcfgc
-+File=oxygensettingsdata.kcfg
- ClassName=InternalSettings
- NameSpace=Oxygen
- Singleton=false
-
---- a/kstyle/oxygenstyleconfigdata.kcfgc
-+++ b/kstyle/oxygenstyleconfigdata.kcfgc
-@@ -1,4 +1,4 @@
--File=oxygen.kcfgc
-+File=oxygen.kcfg
- ClassName=StyleConfigData
- NameSpace=Oxygen
- Singleton=true
-
---- a/liboxygen/oxygenactiveshadowconfiguration.kcfgc
-+++ b/liboxygen/oxygenactiveshadowconfiguration.kcfgc
-@@ -1,4 +1,4 @@
--File=oxygenactiveshadowconfigdata.kcfgc
-+File=oxygenactiveshadowconfigdata.kcfg
- ClassName=ActiveShadowConfiguration
- NameSpace=Oxygen
- Singleton=true
-
---- a/liboxygen/oxygeninactiveshadowconfiguration.kcfgc
-+++ b/liboxygen/oxygeninactiveshadowconfiguration.kcfgc
-@@ -1,4 +1,4 @@
--File=oxygeninactiveshadowconfigdata.kcfgc
-+File=oxygeninactiveshadowconfigdata.kcfg
- ClassName=InactiveShadowConfiguration
- NameSpace=Oxygen
- Singleton=true
diff --git a/oxygen-5.8.3.tar.xz b/oxygen-5.8.3.tar.xz
deleted file mode 100644
index 3a9e0de..0000000
--- a/oxygen-5.8.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f0e48a205352a63fe80fa7a24a052154d1ca7bfc7f7af5ebcf5c159366a2c47
-size 4457872
diff --git a/oxygen-5.8.4.tar.xz b/oxygen-5.8.4.tar.xz
new file mode 100644
index 0000000..bfe0d56
--- /dev/null
+++ b/oxygen-5.8.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e40a7df182df7b8c104acfe809a8d94ed2841065bbcec0faf7558731c3a91fbd
+size 4465952
diff --git a/oxygen5.changes b/oxygen5.changes
index a1e68a5..5a7bc82 100644
--- a/oxygen5.changes
+++ b/oxygen5.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Nov 23 10:59:30 UTC 2016 - fabian@ritter-vogt.de
+
+- Update to 5.8.4
+  * New bugfix release
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.8.4.php
+- Remove upstream patches:
+  * Fix-broken-kcfgc-files.patch
+
 -------------------------------------------------------------------
 Sun Nov  6 14:23:31 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/oxygen5.spec b/oxygen5.spec
index 73651d8..f3f12be 100644
--- a/oxygen5.spec
+++ b/oxygen5.spec
@@ -20,9 +20,9 @@
 %define kwin_deco 1
 
 Name:           oxygen5
-Version:        5.8.3
+Version:        5.8.4
 Release:        0
-# Full Plasma 5 version (e.g. 5.8.3)
+# Full Plasma 5 version (e.g. 5.8.4)
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
 # Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.90 in KUF)
 %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
@@ -32,8 +32,6 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/plasma/%{version}/oxygen-%{version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM Fix-broken-kcfgc-files.patch
-Patch0:         Fix-broken-kcfgc-files.patch
 BuildRequires:  extra-cmake-modules >= 0.0.9
 BuildRequires:  kf5-filesystem
 BuildRequires:  cmake(KF5Completion)
@@ -141,7 +139,6 @@ This package contains the libraries Oxygen's KWin decoration.
 %lang_package
 %prep
 %setup -q -n oxygen-%{version}
-%patch0 -p1
 
 %build
 %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}