diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.31.recipe
similarity index 71%
rename from media-gfx/graphicsmagick/graphicsmagick-1.3.26.recipe
rename to media-gfx/graphicsmagick/graphicsmagick-1.3.31.recipe
index aa7244d27..555cc7a28 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.recipe
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.31.recipe
@@ -1,30 +1,30 @@
 SUMMARY="Collection of image processing tools"
-DESCRIPTION="GraphicsMagick provides a set of command-line applications to manipulate\
-image files. It is a fork of the ImageMagick project and therefore offers\
+DESCRIPTION="GraphicsMagick provides a set of command-line applications to manipulate \
+image files. It is a fork of the ImageMagick project and therefore offers \
 a similar set of features, but puts a larger emphasis on stability.
 
-The tools support a large variety of image formats from the widely used\
-jpeg, tiff, bmp or xpm to special-purpose formats such as fits or image\
-formats found on some photo CDs. They can convert between formats,\
-concatenate several images into one, annotate and distort them, create\
+The tools support a large variety of image formats from the widely used \
+jpeg, tiff, bmp or xpm to special-purpose formats such as fits or image \
+formats found on some photo CDs. They can convert between formats, \
+concatenate several images into one, annotate and distort them, create \
 thumbnails or manipulate the colormap."
 HOMEPAGE="http://www.graphicsmagick.org"
-COPYRIGHT="2002-2014 GraphicsMagick Group"
+COPYRIGHT="2002-2018 GraphicsMagick Group"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$portVersion/GraphicsMagick-$portVersion.tar.gz"
-CHECKSUM_SHA256="ab06d07cda5181f7829714c9f5641c0a93a0c3af2dacd747ed48d534e1ed0b3a"
+CHECKSUM_SHA256="76321c5c3c78937ac9bdfb037af6da565d2e0022b7a55cacef5f262d938825b7"
 SOURCE_DIR="GraphicsMagick-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	graphicsmagick$secondaryArchSuffix = $portVersion
 	cmd:gm$secondaryArchSuffix
-	lib:libgraphicsmagick$secondaryArchSuffix = 3.16.0 compat >= 3
-	lib:libgraphicsmagick++$secondaryArchSuffix = 12.2.0 compat >= 12
-	lib:libgraphicsmagickwand$secondaryArchSuffix = 2.8.0 compat >= 2
+	lib:libGraphicsMagick$secondaryArchSuffix = 3.19.0 compat >= 3
+	lib:libGraphicsMagick++$secondaryArchSuffix = 12.4.0 compat >= 12
+	lib:libGraphicsMagickWand$secondaryArchSuffix = 2.9.1 compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,7 +32,7 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:liblcms2$secondaryArchSuffix
 	lib:libltdl$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libwebp$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -43,9 +43,9 @@ PROVIDES_devel="
 	cmd:GraphicsMagick++_config$secondaryArchSuffix
 	cmd:GraphicsMagick_config$secondaryArchSuffix
 	cmd:GraphicsMagickWand_config$secondaryArchSuffix
-	devel:libGraphicsMagick$secondaryArchSuffix = 3.16.0 compat >= 3
-	devel:libGraphicsMagick++$secondaryArchSuffix = 12.2.0 compat >= 12
-	devel:libGraphicsMagickWand$secondaryArchSuffix = 2.8.0 compat >= 2
+	devel:libGraphicsMagick$secondaryArchSuffix = 3.19.0 compat >= 3
+	devel:libGraphicsMagick++$secondaryArchSuffix = 12.4.0 compat >= 12
+	devel:libGraphicsMagickWand$secondaryArchSuffix = 2.9.1 compat >= 2
 	"
 REQUIRES_devel="
 	graphicsmagick$secondaryArchSuffix == $portVersion
@@ -55,7 +55,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:liblcms2$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -67,6 +67,10 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage graphicsmagick$secondaryArchSuffix \
+	$libDir/libGraphicsMagick.so.3.19.0 \
+	$libDir/libGraphicsMagickWand.so.2.9.1
+
 BUILD()
 {
 	runConfigure ./configure --enable-shared --with-modules \
@@ -87,3 +91,8 @@ INSTALL()
 		$developDir \
 		$binDir/*-config
 }
+
+TEST()
+{
+	make check
+}