diff --git a/Fix-broken-kcfgc-files.patch b/Fix-broken-kcfgc-files.patch
new file mode 100644
index 0000000..5d17e48
--- /dev/null
+++ b/Fix-broken-kcfgc-files.patch
@@ -0,0 +1,46 @@
+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/oxygen5.changes b/oxygen5.changes
index d1d98b0..a1e68a5 100644
--- a/oxygen5.changes
+++ b/oxygen5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov  6 14:23:31 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Added Fix-broken-kcfgc-files.patch from upstream
+
 -------------------------------------------------------------------
 Thu Nov  3 17:41:25 UTC 2016 - fabian@ritter-vogt.de
 
diff --git a/oxygen5.spec b/oxygen5.spec
index 67e1e04..73651d8 100644
--- a/oxygen5.spec
+++ b/oxygen5.spec
@@ -32,6 +32,8 @@ 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)
@@ -139,6 +141,7 @@ 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}