diff --git a/breeze-5.8.3.tar.xz b/breeze-5.8.3.tar.xz
deleted file mode 100644
index d9595ad..0000000
--- a/breeze-5.8.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97375eb29d91c05b8fa6a4eb3673e58c64c74751b9b8b0fac46baee857a8f12a
-size 33277616
diff --git a/breeze-5.8.4.tar.xz b/breeze-5.8.4.tar.xz
new file mode 100644
index 0000000..be4e277
--- /dev/null
+++ b/breeze-5.8.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc27a3629beb6b4aa04380421110ea4f28131bea10febf25a7f11ee753deb44b
+size 33280820
diff --git a/breeze.changes b/breeze.changes
index 04502c4..03e9764 100644
--- a/breeze.changes
+++ b/breeze.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
+Wed Nov  9 13:42:39 UTC 2016 - fabian@ritter-vogt.de
+
+- Introduce new _plasma5_bugfix global for more fine-tuned dependencies
+
 -------------------------------------------------------------------
 Tue Nov  1 10:36:40 UTC 2016 - fabian@ritter-vogt.de
 
@@ -6,12 +19,6 @@ Tue Nov  1 10:36:40 UTC 2016 - fabian@ritter-vogt.de
   * For more details please see:
     https://www.kde.org/announcements/plasma-5.8.3.php
 
--------------------------------------------------------------------
-Sun Oct 23 18:02:27 UTC 2016 - wbauer@tmo.at
-
-- Update add-support-for-Q3ListView-to-the-KDE4-style.patch to fix
-  some graphical glitches (boo#1005902)
-
 -------------------------------------------------------------------
 Tue Oct 18 15:16:03 UTC 2016 - fabian@ritter-vogt.de
 
diff --git a/breeze.spec b/breeze.spec
index b9b1130..75b9ee9 100644
--- a/breeze.spec
+++ b/breeze.spec
@@ -18,9 +18,12 @@
 
 %bcond_without lang
 Name:           breeze
-Version:        5.8.3
+Version:        5.8.4
 Release:        0
-%{!?_plasma5_version: %global _plasma5_version %{version}}
+# 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}')}
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= 0.0.13
 BuildRequires:  fdupes
diff --git a/breeze4-style.changes b/breeze4-style.changes
index da61d1f..e891c22 100644
--- a/breeze4-style.changes
+++ b/breeze4-style.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Tue Nov  1 10:36:40 UTC 2016 - fabian@ritter-vogt.de
 
@@ -6,6 +14,12 @@ Tue Nov  1 10:36:40 UTC 2016 - fabian@ritter-vogt.de
   * For more details please see:
     https://www.kde.org/announcements/plasma-5.8.3.php
 
+-------------------------------------------------------------------
+Sun Oct 23 18:02:27 UTC 2016 - wbauer@tmo.at
+
+- Update add-support-for-Q3ListView-to-the-KDE4-style.patch to fix
+  some graphical glitches (boo#1005902)
+
 -------------------------------------------------------------------
 Tue Oct 18 15:16:03 UTC 2016 - fabian@ritter-vogt.de
 
diff --git a/breeze4-style.spec b/breeze4-style.spec
index 97b66c9..aa5fd9e 100644
--- a/breeze4-style.spec
+++ b/breeze4-style.spec
@@ -17,7 +17,7 @@
 
 
 Name:           breeze4-style
-Version:        5.8.3
+Version:        5.8.4
 Release:        0
 BuildRequires:  automoc4
 BuildRequires:  cmake >= 2.8.12