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.changes b/kimageformats.changes
index f9cf4c7..d2e0143 100644
--- a/kimageformats.changes
+++ b/kimageformats.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 
diff --git a/kimageformats.spec b/kimageformats.spec
index 4fb705a..55be577 100644
--- a/kimageformats.spec
+++ b/kimageformats.spec
@@ -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