diff --git a/ImageMagick.changes b/ImageMagick.changes
index 8e776c8..27bb4d6 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 13 14:03:12 UTC 2014 - pgajdos@suse.com
+
+- modified patches [bnc#843673]:
+  * disable_mat_test.patch -- rather than disable the test,
+    use upstream solution (increase threshold for mean error)
+    -- use this patch also for s390, s390x
+
 -------------------------------------------------------------------
 Wed Jan  8 18:01:26 UTC 2014 - pgajdos@suse.com
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 442e598..0df3afd 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -76,6 +76,7 @@ Patch4:         ImageMagick-6.8.5.7-no-XPMCompliance.patch
 # bugs
 # will ask upstream if needed, or if other solution exists
 Patch11:        ImageMagick-6.8.4.0-dont-build-in-install.patch
+# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957
 Patch12:        disable_mat_test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -141,8 +142,8 @@ BuildArch:      noarch
 %patch3  -p1
 %patch4  -p1
 %patch11 -p1
-%ifarch ppc ppc64
-%patch12 -p1
+%ifarch ppc ppc64 s390 s390x
+%patch12
 %endif
 
 %build
@@ -407,4 +408,5 @@ HTML documentation for ImageMagick library and scene examples.
 
 
 
+
 %changelog
diff --git a/disable_mat_test.patch b/disable_mat_test.patch
index dc84757..559ea19 100644
--- a/disable_mat_test.patch
+++ b/disable_mat_test.patch
@@ -1,24 +1,13 @@
-Index: ImageMagick-6.8.6-9/PerlMagick/t/read.t
+Index: PerlMagick/t/read.t
 ===================================================================
---- ImageMagick-6.8.6-9.orig/PerlMagick/t/read.t
-+++ ImageMagick-6.8.6-9/PerlMagick/t/read.t
-@@ -15,7 +15,7 @@
- #
- # Test reading formats supported directly by ImageMagick.
- #
--BEGIN { $| = 1; $test=1; print "1..47\n"; }
-+BEGIN { $| = 1; $test=1; print "1..46\n"; }
- END {print "not ok $test\n" unless $loaded;}
- use Image::Magick;
- $loaded=1;
-@@ -72,10 +72,6 @@ print("MAT (MatLab gray 8-bit MSB intege
- ++$test;
- testReadCompare('input_gray_msb_08bit.mat', 'reference/read/input_gray_msb_08bit_mat.miff', q//, 0.2, 1.02);
+--- PerlMagick/t/read.t.orig	2013-11-18 14:03:16.000000000 +0100
++++ PerlMagick/t/read.t	2014-02-13 15:03:03.017996724 +0100
+@@ -74,7 +74,7 @@
  
--print("MAT (MatLab gray 64-bit LSB double) ...\n");
--++$test;
+ print("MAT (MatLab gray 64-bit LSB double) ...\n");
+ ++$test;
 -testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02);
--
++testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.02);
+ 
  print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
  ++$test;
- testReadCompare('input_rgb_lsb_08bit.mat', 'reference/read/input_rgb_lsb_08bit_mat.miff', q//, 0.2, 1.02);