diff --git a/common/shlibs b/common/shlibs
index f416f79fc9..26b6ae81b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -329,8 +329,8 @@ libMagick++.so.5 libmagick-6.7.3.8_1
 libMagickCore.so.6 libmagick-6.8.0.7_1
 libMagickWand.so.6 libmagick-6.8.0.7_1
 libMagick++.so.6 libmagick-6.8.0.7_1
-libMagickCore-6.Q16.so.1 libmagick-6.8.4.9_1
-libMagickWand-6.Q16.so.1 libmagick-6.8.4.9_1
+libMagickCore-6.Q16.so.2 libmagick-6.8.8.4_1
+libMagickWand-6.Q16.so.2 libmagic-6.8.8.4_1
 libMagick++-6.Q16.so.3 libmagick-6.8.7.7_1
 libltdl.so.7 libltdl-2.2.6_1
 libpoppler.so.43 poppler-0.24.1_1
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4969995f71..8812224678 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -27,6 +27,21 @@ makedepends="perl>=5.18 libjpeg-turbo-devel libpng-devel>=1.6 tiff-devel
  libwmf-devel fftw-devel djvulibre-devel liblzma-devel libgomp-devel
  librsvg-devel ghostscript-devel"
 
+conf_files="
+	/etc/ImageMagick/coder.xml
+	/etc/ImageMagick/colors.xml
+	/etc/ImageMagick/delegates.xml
+	/etc/ImageMagick/log.xml
+	/etc/ImageMagick/magic.xml
+	/etc/ImageMagick/mime.xml
+	/etc/ImageMagick/policy.xml
+	/etc/ImageMagick/sRGB.icc
+	/etc/ImageMagick/thresholds.xml
+	/etc/ImageMagick/type.xml
+	/etc/ImageMagick/type-dejavu.xml
+	/etc/ImageMagick/type-ghostscript.xml
+	/etc/ImageMagick/type-windows.xml"
+
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 	vinstall NOTICE 644 usr/share/licenses/${pkgname}
@@ -63,23 +78,3 @@ libmagick-perl_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-ImageMagick_package() {
-	conf_files="
-		/etc/ImageMagick/coder.xml
-		/etc/ImageMagick/colors.xml
-		/etc/ImageMagick/delegates.xml
-		/etc/ImageMagick/log.xml
-		/etc/ImageMagick/magic.xml
-		/etc/ImageMagick/mime.xml
-		/etc/ImageMagick/policy.xml
-		/etc/ImageMagick/sRGB.icc
-		/etc/ImageMagick/thresholds.xml
-		/etc/ImageMagick/type.xml
-		/etc/ImageMagick/type-dejavu.xml
-		/etc/ImageMagick/type-ghostscript.xml
-		/etc/ImageMagick/type-windows.xml"
-	pkg_install() {
-		vmove all
-	}
-}