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..75a0d21 100644
--- a/ImageMagick-6.8.8-1-disable-insecure-coders.patch
+++ b/ImageMagick-6.8.8-1-disable-insecure-coders.patch
@@ -1,12 +1,8 @@
-Index: ImageMagick-6.8.8-1/config/policy.xml
-
-Disable insecure loaders by default bsc#978061
-sflees@suse.de
-
+Index: config/policy.xml
===================================================================
---- ImageMagick-6.8.8-1.orig/config/policy.xml
-+++ ImageMagick-6.8.8-1/config/policy.xml
-@@ -56,4 +56,11 @@
+--- config/policy.xml.orig
++++ config/policy.xml
+@@ -62,4 +62,15 @@
@@ -17,4 +13,8 @@ sflees@suse.de
+
+
+
++
++
++
++
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 1f93c8b..142a911 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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..4d837ef 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,7 +1,7 @@
#
# spec file for package ImageMagick
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -72,7 +72,7 @@ BuildRequires: zip
Version: %{mfr_version}.%{mfr_revision}
Release: 0
Summary: Viewer and Converter for Images
-License: ImageMagick
+License: SUSE-ImageMagick
Group: Productivity/Graphics/Other
Url: http://www.imagemagick.org
Source: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz
@@ -249,10 +249,10 @@ HTML documentation for ImageMagick library and scene examples.
%patch0
%patch1
%patch2
-%patch3 -p1
-%patch4 -p1
-%patch11 -p1
-%patch20 -p1
+%patch3
+%patch4
+%patch11
+%patch20
# remove executeable bits from per demos
chmod -x PerlMagick/demo/*.pl