diff --git a/media-gfx/imagemagick/imagemagick-6.9.6.3.recipe b/media-gfx/imagemagick/imagemagick-6.9.6.3.recipe
index a0e4f3aae..ea272353a 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.6.3.recipe
+++ b/media-gfx/imagemagick/imagemagick-6.9.6.3.recipe
@@ -8,7 +8,7 @@ draw text, lines, polygons, ellipses and Bézier curves."
 HOMEPAGE="http://www.imagemagick.org"
 COPYRIGHT="1999-2016 ImageMagick Studio LLC"
 LICENSE="IMAGEMAGICK"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.imagemagick.org/download/releases/ImageMagick-6.9.6-3.tar.xz"
 CHECKSUM_SHA256="c34c16d345e2d158bf9c8cf486d0c559e6c9831c31a50f4bb4cb6cd8ea413656"
 SOURCE_DIR="ImageMagick-6.9.6-3"
@@ -19,44 +19,45 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	imagemagick$secondaryArchSuffix = $portVersion
-	cmd:Magick++_config
-	cmd:Magick_config
-	cmd:MagickCore_config
-	cmd:MagickWand_config
-	cmd:Wand_config
-	cmd:animate
-	cmd:compare
-	cmd:composite
-	cmd:conjure
-	cmd:convert
-	cmd:display
-	cmd:identify
-	cmd:import
-	cmd:mogrify
-	cmd:montage
-	cmd:stream
-	lib:libMagick++_6.Q16 = 6.0.0 compat >= 6
-	lib:libMagickCore_6.Q16 = 2.0.0 compat >= 2
-	lib:libMagickWand_6.Q16 = 2.0.0 compat >= 2
+	cmd:Magick++_config$secondaryArchSuffix
+	cmd:Magick_config$secondaryArchSuffix
+	cmd:MagickCore_config$secondaryArchSuffix
+	cmd:MagickWand_config$secondaryArchSuffix
+	cmd:Wand_config$secondaryArchSuffix
+	cmd:animate$secondaryArchSuffix
+	cmd:compare$secondaryArchSuffix
+	cmd:composite$secondaryArchSuffix
+	cmd:conjure$secondaryArchSuffix
+	cmd:convert$secondaryArchSuffix
+	cmd:display$secondaryArchSuffix
+	cmd:identify$secondaryArchSuffix
+	cmd:import$secondaryArchSuffix
+	cmd:mogrify$secondaryArchSuffix
+	cmd:montage$secondaryArchSuffix
+	cmd:stream$secondaryArchSuffix
+	lib:libMagick++_6.Q16$secondaryArchSuffix = 6.0.0 compat >= 6
+	lib:libMagickCore_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
+	lib:libMagickWand_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
 REQUIRES="
-	haiku
-	lib:libbz2
-	lib:libfreetype
-	lib:libjpeg
-	lib:libltdl
-	lib:libpng16
-	lib:libtiff
-	lib:libwebp
-	lib:libxml2
-	lib:libz
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libgomp$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libltdl$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	imagemagick${secondaryArchSuffix}_devel = $portVersion
-	devel:libMagick++_6.Q16 = 6.0.0 compat >= 6
-	devel:libMagickCore_6.Q16 = 2.0.0 compat >= 2
-	devel:libMagickWand_6.Q16 = 2.0.0 compat >= 2
+	devel:libMagick++_6.Q16$secondaryArchSuffix = 6.0.0 compat >= 6
+	devel:libMagickCore_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
+	devel:libMagickWand_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
 REQUIRES_devel="
 	imagemagick${secondaryArchSuffix} == $portVersion base