diff --git a/oxygen-icons5-5.20.0.tar.xz b/oxygen-icons5-5.20.0.tar.xz
deleted file mode 100644
index ccd5ac6..0000000
--- a/oxygen-icons5-5.20.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bb66232d940e108b8f7a6bf8ac7481e0ed7921de43c0dcafd737d62d6404182
-size 233252060
diff --git a/oxygen-icons5-5.21.0.tar.xz b/oxygen-icons5-5.21.0.tar.xz
new file mode 100644
index 0000000..1bcf40e
--- /dev/null
+++ b/oxygen-icons5-5.21.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5b4e30506141ead2d51ee2b96a9eaaa1c8d5612790676a3a0d43aa3e0ff011f
+size 233267944
diff --git a/oxygen5-icon-theme.changes b/oxygen5-icon-theme.changes
index c8bc71c..9dd0e52 100644
--- a/oxygen5-icon-theme.changes
+++ b/oxygen5-icon-theme.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr  4 14:23:19 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.21.0
+  * Upgrade Qt version requirement to 5.4.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.21.0.php
+
 -------------------------------------------------------------------
 Sat Feb  6 18:09:00 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/oxygen5-icon-theme.spec b/oxygen5-icon-theme.spec
index 860943e..99e48c6 100644
--- a/oxygen5-icon-theme.spec
+++ b/oxygen5-icon-theme.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define _tar_path 5.20
+%define _tar_path 5.21
 Name:           oxygen5-icon-theme
-Version:        5.20.0
+Version:        5.21.0
 Release:        0
 Summary:        Oxygen Icon Theme
 License:        LGPL-3.0
@@ -81,6 +81,16 @@ done
 
 cp -r ../scalable %{buildroot}%{_datadir}/icons/oxygen
 
+# kdepim conflict
+rm -rfv %{buildroot}%{_kf5_iconsdir}/oxygen/*/mimetypes/x-mail-distribution-list.png
+# kdebase4-workspace conflict
+rm -rfv %{buildroot}%{_kf5_iconsdir}/oxygen/*/mimetypes/fonts-package.png
+# dragon conflict
+rm -rfv %{buildroot}%{_kf5_iconsdir}/oxygen/22x22/actions/player-volume-muted.png
+# korganizer conflict
+rm -rfv %{buildroot}%{_kf5_iconsdir}/oxygen/22x22/actions/checkmark.png
+rm -rfv %{buildroot}%{_kf5_iconsdir}/oxygen/16x16/actions/smallclock.png
+
   %fdupes %{buildroot}
 
 %package scalable