diff --git a/tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch b/tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch
new file mode 100644
index 0000000..2fd02ab
--- /dev/null
+++ b/tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch
@@ -0,0 +1,16 @@
+--- a/libtiff/tif_fax3.h
++++ b/libtiff/tif_fax3.h
+@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
+ #define S_MakeUp   11
+ #define S_EOL      12
+ 
++/* WARNING: do not change the layout of this structure as the Halyfax software */
++/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
+ typedef struct {                /* state table entry */
+ 	unsigned char State;    /* see above */
+ 	unsigned char Width;    /* width of code in bits */
+-	uint16 Param;           /* unsigned 16-bit run length in bits */
++	uint32 Param;           /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
+ } TIFFFaxTabEnt;
+ 
+ extern const TIFFFaxTabEnt TIFFFaxMainTable[];
diff --git a/tiff.changes b/tiff.changes
index ac62d2a..1e5e67b 100644
--- a/tiff.changes
+++ b/tiff.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:40:16 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch
+    - Fix a regression introduced in 4.0.7 (bsc#1022103)
+    - http://bugzilla.maptools.org/show_bug.cgi?id=2636
+
 -------------------------------------------------------------------
 Fri Jan 13 10:03:25 UTC 2017 - fstrba@suse.com
 
diff --git a/tiff.spec b/tiff.spec
index cf81ff2..95ac9ed 100644
--- a/tiff.spec
+++ b/tiff.spec
@@ -34,6 +34,9 @@ Patch3:         tiff-4.0.7-CVE-2015-7554.patch
 # http://bugzilla.maptools.org/show_bug.cgi?id=2656 and
 # http://bugzilla.maptools.org/show_bug.cgi?id=2657
 Patch4:         tiff-4.0.7-CVE-2017-5225.patch
+# http://http://bugzilla.maptools.org/show_bug.cgi?id=2636
+# bsc#1022103
+Patch5:         tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libjpeg-devel
@@ -99,6 +102,7 @@ the libtiff library.
 %patch1 -p1
 %patch3
 %patch4 -p1
+%patch5 -p1
 
 %build
 CFLAGS="%{optflags} -fPIE"