diff --git a/fix-psd.patch b/fix-psd.patch
new file mode 100644
index 0000000..477239b
--- /dev/null
+++ b/fix-psd.patch
@@ -0,0 +1,31 @@
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Sun, 10 Jan 2016 12:24:35 +0000
+Subject: fix loading of RLE compressed PSD files
+X-Git-Url: http://quickgit.kde.org/?p=kimageformats.git&a=commitdiff&h=5d7ef7c38e9f6aa473fec5ee7f1daabcb405ffd7
+---
+fix loading of RLE compressed PSD files
+
+decodeRLEData() expects a quint16 as length, but the PSD loader calls it
+with a quint32.
+We do need quint32 for PSD, otherwise it would overflow for images
+bigger than 256x256 pixels (it's the pixel count there, i.e. width x
+height).
+
+BUG: 354413
+FIXED-IN: 5.19.0
+REVIEW: 126684
+---
+
+
+--- a/src/imageformats/rle_p.h
++++ b/src/imageformats/rle_p.h
+@@ -75,7 +75,7 @@
+ static inline bool decodeRLEData(RLEVariant variant,
+                                  QDataStream &stream,
+                                  Item *dest,
+-                                 quint16 length,
++                                 quint32 length,
+                                  Func1 readData,
+                                  Func2 updateItem)
+ {
+
diff --git a/kimageformats-5.17.0.tar.xz b/kimageformats-5.17.0.tar.xz
deleted file mode 100644
index d792378..0000000
--- a/kimageformats-5.17.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a7d58e573b82ff4fcb9a8d9313e7b9c77e487ee186d1dea7dd081c2f8018037
-size 85184
diff --git a/kimageformats-5.18.0.tar.xz b/kimageformats-5.18.0.tar.xz
new file mode 100644
index 0000000..85d91e4
--- /dev/null
+++ b/kimageformats-5.18.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc5e4977fe26278374f1b18cc1225a7e921b5401cea2bc95f35893ae0960dff8
+size 85192
diff --git a/kimageformats.changes b/kimageformats.changes
index d330dfa..d2e0143 100644
--- a/kimageformats.changes
+++ b/kimageformats.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan  8 20:35:13 UTC 2016 - wbauer@tmo.at
+
+- Add fix-psd.patch: fixes loading of RLE compressed PSD files
+  (kde#354413)
+
+-------------------------------------------------------------------
+Sat Jan  2 17:43:47 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.18.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.18.0.php
+
 -------------------------------------------------------------------
 Thu Dec 10 23:06:47 UTC 2015 - hrvoje.senjan@gmail.com
 
diff --git a/kimageformats.spec b/kimageformats.spec
index 6abba8d..55be577 100644
--- a/kimageformats.spec
+++ b/kimageformats.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kimageformats
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
 #
 
 
-%define _tar_path 5.17
+%define _tar_path 5.18
 Name:           kimageformats
-Version:        5.17.0
+Version:        5.18.0
 Release:        0
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= %{_tar_path}
@@ -38,6 +38,8 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
+# PATCH-FIX-UPSTREAM fix-psd.patch kde#354413 -- fixes loading of RLE compressed PSD files
+Patch:          fix-psd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,6 +50,7 @@ image formats.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
   %cmake_kf5 -d build