diff --git a/ImageMagick-6.6.8.9-doc.patch b/ImageMagick-6.6.8.9-doc.patch
index 9df5f4a..69cb334 100644
--- a/ImageMagick-6.6.8.9-doc.patch
+++ b/ImageMagick-6.6.8.9-doc.patch
@@ -2,7 +2,7 @@ Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
-@@ -3075,7 +3075,7 @@ AC_SUBST(FILTER_PATH)
+@@ -2941,7 +2941,7 @@ AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
diff --git a/ImageMagick-6.6.8.9-examples.patch b/ImageMagick-6.6.8.9-examples.patch
index 2630cd3..8775573 100644
--- a/ImageMagick-6.6.8.9-examples.patch
+++ b/ImageMagick-6.6.8.9-examples.patch
@@ -1,4 +1,6 @@
---- Magick++/demo/makefile.2
+Index: Magick++/demo/makefile.2
+===================================================================
+--- /dev/null
+++ Magick++/demo/makefile.2
@@ -0,0 +1,8 @@
+LDFLAGS= $(shell Magick-config --ldflags)
diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch
index 578852a..ad1fb32 100644
--- a/ImageMagick-6.7.6.1-no-dist-lzip.patch
+++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch
@@ -1,8 +1,8 @@
Index: configure.ac
===================================================================
---- configure.ac.orig 2016-04-14 16:11:00.551271813 +0200
-+++ configure.ac 2016-04-14 16:12:17.951272238 +0200
-@@ -49,7 +49,7 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -49,7 +49,7 @@ AC_CONFIG_HEADERS([config/config.h])
AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore])
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
diff --git a/ImageMagick-6.8.4.0-dont-build-in-install.patch b/ImageMagick-6.8.4.0-dont-build-in-install.patch
index 7298a67..81c518d 100644
--- a/ImageMagick-6.8.4.0-dont-build-in-install.patch
+++ b/ImageMagick-6.8.4.0-dont-build-in-install.patch
@@ -1,8 +1,8 @@
perl Makefile.PL always regenerates Makefile
-Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am
+Index: PerlMagick/Makefile.am
===================================================================
---- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am
-+++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am
+--- PerlMagick/Makefile.am.orig
++++ PerlMagick/Makefile.am
@@ -57,9 +57,8 @@ PERLMAGICK_CHECKSCRPTS =
$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
diff --git a/ImageMagick-6.8.4.0-rpath.patch b/ImageMagick-6.8.4.0-rpath.patch
index 5dbc0b2..1313588 100644
--- a/ImageMagick-6.8.4.0-rpath.patch
+++ b/ImageMagick-6.8.4.0-rpath.patch
@@ -1,8 +1,8 @@
-Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am
+Index: PerlMagick/Makefile.am
===================================================================
---- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am
-+++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am
-@@ -70,7 +69,7 @@ check-perl: $(PERLMAKEFILE)
+--- PerlMagick/Makefile.am.orig
++++ PerlMagick/Makefile.am
+@@ -70,7 +70,7 @@ check-perl: $(PERLMAKEFILE)
cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
perl-build: $(PERLMAKEFILE)
diff --git a/ImageMagick-6.8.5.7-no-XPMCompliance.patch b/ImageMagick-6.8.5.7-no-XPMCompliance.patch
index 3fadb28..ccd5cc8 100644
--- a/ImageMagick-6.8.5.7-no-XPMCompliance.patch
+++ b/ImageMagick-6.8.5.7-no-XPMCompliance.patch
@@ -1,8 +1,8 @@
-Index: ImageMagick-6.8.5-7/coders/xpm.c
+Index: coders/xpm.c
===================================================================
---- ImageMagick-6.8.5-7.orig/coders/xpm.c
-+++ ImageMagick-6.8.5-7/coders/xpm.c
-@@ -386,7 +386,7 @@ static Image *ReadXPMImage(const ImageIn
+--- coders/xpm.c.orig
++++ coders/xpm.c
+@@ -415,7 +415,7 @@ static Image *ReadXPMImage(const ImageIn
image->storage_class=DirectClass;
image->matte=MagickTrue;
}
diff --git a/ImageMagick-6.8.8-1-disable-insecure-coders.patch b/ImageMagick-6.8.8-1-disable-insecure-coders.patch
index 9cdbf88..6ce2835 100644
--- a/ImageMagick-6.8.8-1-disable-insecure-coders.patch
+++ b/ImageMagick-6.8.8-1-disable-insecure-coders.patch
@@ -1,14 +1,10 @@
-Index: ImageMagick-6.8.8-1/config/policy.xml
-
-Disable insecure loaders by default bsc#978061
-sflees@suse.de
-
+Index: ImageMagick-6.9.4-1/config/policy.xml
===================================================================
---- ImageMagick-6.8.8-1.orig/config/policy.xml
-+++ ImageMagick-6.8.8-1/config/policy.xml
-@@ -56,4 +56,11 @@
-
-
+--- ImageMagick-6.9.4-1.orig/config/policy.xml 2016-05-09 19:28:58.000000000 +0200
++++ ImageMagick-6.9.4-1/config/policy.xml 2016-05-17 11:09:37.470928022 +0200
+@@ -64,4 +64,15 @@
+
+
+
+
@@ -17,4 +13,8 @@ sflees@suse.de
+
+
+
++
++
++
++
diff --git a/ImageMagick-6.9.3-10.tar.xz b/ImageMagick-6.9.3-10.tar.xz
deleted file mode 100644
index 7c35489..0000000
--- a/ImageMagick-6.9.3-10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e33f021c879f31703f9e620f578ccf7d221a34941589da4bbe967b16a814336a
-size 8784108
diff --git a/ImageMagick-6.9.3-10.tar.xz.asc b/ImageMagick-6.9.3-10.tar.xz.asc
deleted file mode 100644
index df0d289..0000000
--- a/ImageMagick-6.9.3-10.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJXKf1FAAoJEImrY9SCdzd6rUQP+wQAnK8TATsxTUrGhocQnBrT
-vc8l15R1U96Y8fqoOEr6xRzFtrRUt0gaxbdo5VJXMCSIMYGuwWqD7NijsgPo6INL
-iuCb+fqkdwD+MdVHXyTnWfmG3xdY+VLTVkEzW7PNdz4I15WCoe8iZNQSpN8EY8Yv
-RxrAB9nT5awFSfLg+5AixwxerktjresoQfknzC7uZjcHG6T568teUF5Ap7xMjAOd
-w2NPQzEPXZt3cOuW/Sw/PqGNqHnY9yDJ+ciUTaVAyI8T48A5KIJq6OrVeDDsyNnJ
-nxfqlo0vAiT8os3ZoSD8CByIeOf5DqlWYin9ymRojqn3MUsTFC92ZH2MlVRK/jVJ
-sRjA7pOjqR9Ml5nGP92Ze+9l73RNt840jJEXKyySlVEMSSLloS+MjuUQFH0xhLf9
-FEZ2qZKKaTA3QAoiag1LBuaU/mms9Sv2PXbgW3JZWxw7xMWh9EazVJyPfbhaA4mh
-//eX1iuZsggoQs9VQTcr5CTJBy9WxUIVglcxFEXyuLZPu+JkYIYUV1JT2yEpypIq
-T7onwUyrSXjPSh4KqeeI1U1yUIfPEFLADHo219vNLiH0ceG51d+lEbqAMB/6CMPf
-sMFMjzGRrU4Sc5YqSjPoPw65yHnWjMAzTSBNbjUT1oXlEUJ82qfI4nygK0Evdfpm
-jr2tioHe8JIfFvnAxPM5
-=cE7v
------END PGP SIGNATURE-----
diff --git a/ImageMagick-6.9.4-1.tar.xz b/ImageMagick-6.9.4-1.tar.xz
new file mode 100644
index 0000000..08e287d
--- /dev/null
+++ b/ImageMagick-6.9.4-1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b
+size 8789688
diff --git a/ImageMagick-6.9.4-1.tar.xz.asc b/ImageMagick-6.9.4-1.tar.xz.asc
new file mode 100644
index 0000000..c60bc0e
--- /dev/null
+++ b/ImageMagick-6.9.4-1.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJXMTreAAoJEImrY9SCdzd6H30P/RG55RDq9x9co7ff6DVcVIqh
+6/zgKm1cvhgk3ssaaqXuQMlqITfDEo4vKfYFapJMYlSPY8o3p+6WWwGSVGurZiLR
+smhlqPLPIyaRmnwoBpiTb+LgzeLfauxznaXI1uh0T2oFPu3UkFay9ChIh1gI2whk
+8HU3fB3EMo8E6Zykb3qsBf4tL59/QJeVyJBa/C1byq1kqZDGaDOhsSalupeIWNSp
+FWpRLp7Gw77r4zyrr6TIjEayY+tgm6zvVJPl2ipvGZ/o+1HkOozhUJp3ni+tWDA4
+UkhJBZIqwc2BETIIl9u3hXI/m8UJ69198b1X0XMpcH7K81iEpOp9kYAfqZfXJjBp
+9Krc0fXLaeaDkSVc70xzXyJwbKJst61gJcCp017+Am+ZLOpxqFuJSOJS6Ua2Fjec
+p/6YuIaxNbI+if8E3Yy34DZh0AojPJ0+GoZk8ZChZL8q9X70eX8Vw04MrUKExS3M
+IK5at4Fk/HRTvfj9gOG+TxChjWcnfpJDr3g+VTIsTFmBqZ4fBkHyFCMPxFTUkCif
+TF6AoGrZxdSOdpDstk6nNDJfzI/n/mipnORRxxivLswrA8gabt04AZJT+fww7Y4x
+rRaBglb7W+GgZSo4yS/Ve+wYLQf8Rhwi2JayJicJ2RnaAyRb4v0eHcHrua4yF5eM
+o6IQM3HqSMPUrXs3uiSp
+=UZ1q
+-----END PGP SIGNATURE-----
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 1f93c8b..921700e 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue May 17 09:10:23 UTC 2016 - pgajdos@suse.com
+
+- updated to 6.9.4-1:
+ * Remove https delegate.
+ * Check for buffer overflow in magick/draw.c/DrawStrokePolygon().
+ * Replace show delegate title with image filename rather than label.
+ * Fix GetNextToken() off by one error.
+ * Remove support for internal ephemeral coder.
+- refreshed ImageMagick-6.8.8-1-disable-insecure-coders.patch
+- believe or not, correct license string is ImageMagick:
+ http://spdx.org/licenses/ImageMagick.html
+
+-------------------------------------------------------------------
+Wed May 11 11:56:25 UTC 2016 - chris@computersalat.de
+
+- rework ImageMagick-6.8.8-1-disable-insecure-coders.patch
+ * add new policy (TEXT, SHOW, WIN and PLT)
+- rebase patches (p0)
+ * ImageMagick-6.6.8.9-doc.patch
+ * ImageMagick-6.6.8.9-examples.patch
+ * ImageMagick-6.7.6.1-no-dist-lzip.patch
+ * ImageMagick-6.8.4.0-dont-build-in-install.patch
+ * ImageMagick-6.8.4.0-rpath.patch
+ * ImageMagick-6.8.5.7-no-XPMCompliance.patch
+ * ImageMagick-6.8.8-1-disable-insecure-coders.patch
+
-------------------------------------------------------------------
Thu May 5 13:31:42 UTC 2016 - vcizek@suse.com
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 14d3234..7c7bfb7 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -62,8 +62,8 @@ BuildRequires: xz
BuildRequires: zip
%define maj 6
-%define mfr_version %{maj}.9.3
-%define mfr_revision 10
+%define mfr_version %{maj}.9.4
+%define mfr_revision 1
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 2
@@ -249,9 +249,9 @@ HTML documentation for ImageMagick library and scene examples.
%patch0
%patch1
%patch2
-%patch3 -p1
-%patch4 -p1
-%patch11 -p1
+%patch3
+%patch4
+%patch11
%patch20 -p1
# remove executeable bits from per demos