diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 9b439994d21..fb747976378 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 20:09:40 simon Exp $
+# $OpenBSD: Makefile,v 1.4 2007/09/19 05:58:14 steven Exp $
 
 HOMEPAGE=	http://www.graphicsmagick.org/
 CATEGORIES=	devel graphics
 COMMENT=	image processing tools with stable ABI
-DISTNAME=	GraphicsMagick-1.1.7
+DISTNAME=	GraphicsMagick-1.1.9
 
-SHARED_LIBS +=	GraphicsMagick       0.0      # .1.7
-SHARED_LIBS +=	GraphicsMagickWand   0.0      # .0.3
-SHARED_LIBS +=	GraphicsMagick++     0.0      # .1.2
+SHARED_LIBS +=	GraphicsMagick       0.1      # .1.9
+SHARED_LIBS +=	GraphicsMagickWand   0.1      # .0.4
+SHARED_LIBS +=	GraphicsMagick++     0.1      # .1.3
 
 MASTER_SITES=	ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ \
 		${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
@@ -40,7 +40,7 @@ FLAVORS=		no_x11
 FLAVOR?=
 
 CONFIGURE_STYLE=	autoconf
-AUTOCONF_VERSION=	2.59
+AUTOCONF_VERSION=	2.61
 USE_LIBTOOL=		Yes
 
 WANTLIB+=		c iconv jpeg m z
@@ -64,7 +64,7 @@ RUN_DEPENDS+=		:ghostscript-*:print/ghostscript/gnu
 USE_X11=		Yes
 RUN_DEPENDS+=		:transfig-*:print/transfig
 BUILD_DEPENDS+=		:transfig-*:print/transfig
-WANTLIB+=		ICE SM X11 Xext freetype
+WANTLIB+=		ICE SM X11 Xau Xdmcp Xext freetype
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index ca99c00f1b1..e2cef8d22d9 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,5 +1,5 @@
-MD5 (GraphicsMagick-1.1.7.tar.gz) = newiCVALRMYXp4m0By7XJA==
-RMD160 (GraphicsMagick-1.1.7.tar.gz) = KnHPbJKIt1zeRsVDBstTbZeouEA=
-SHA1 (GraphicsMagick-1.1.7.tar.gz) = 776tEvYcFghdgDnD7InOZR2NrEw=
-SHA256 (GraphicsMagick-1.1.7.tar.gz) = yJeO02ZG9SGDqzm/lR0sFKda4OtyB9/y8kaFzApYoPQ=
-SIZE (GraphicsMagick-1.1.7.tar.gz) = 5926667
+MD5 (GraphicsMagick-1.1.9.tar.gz) = R6S2743Rbs2HDoX9PzGkig==
+RMD160 (GraphicsMagick-1.1.9.tar.gz) = LzgsQTOldh/AQIr4Q+Ei5erKUwE=
+SHA1 (GraphicsMagick-1.1.9.tar.gz) = e6OYN2a1blljp1XoI5xOmZ+Z5ZU=
+SHA256 (GraphicsMagick-1.1.9.tar.gz) = 3S520tJItGnu2s61kcOUPR9wSJdzfyaD0H7Y/jRzMm4=
+SIZE (GraphicsMagick-1.1.9.tar.gz) = 5963764
diff --git a/graphics/GraphicsMagick/patches/patch-coders_png_c b/graphics/GraphicsMagick/patches/patch-coders_png_c
index 2fda01a9681..2829341d470 100644
--- a/graphics/GraphicsMagick/patches/patch-coders_png_c
+++ b/graphics/GraphicsMagick/patches/patch-coders_png_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-coders_png_c,v 1.1 2007/04/08 15:22:50 steven Exp $
---- coders/png.c.orig	Sun Apr  8 09:52:01 2007
-+++ coders/png.c	Sun Apr  8 09:52:16 2007
-@@ -1707,7 +1707,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
+$OpenBSD: patch-coders_png_c,v 1.2 2007/09/19 05:58:14 steven Exp $
+--- coders/png.c.orig	Thu Sep 13 03:27:55 2007
++++ coders/png.c	Tue Sep 18 16:05:32 2007
+@@ -1716,7 +1716,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
  #endif
  
  #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
 -&& (PNG_LIBPNG_VER >= 10200)
 +&& (PNG_LIBPNG_VER >= 10200) && defined(PNG_MMX_CODE_SUPPORTED)
    /* Disable thread-unsafe features of pnggccrd */
-   if (png_access_version() >= 10200)
+   if (png_access_version_number() >= 10200)
    {
diff --git a/graphics/GraphicsMagick/patches/patch-configure_ac b/graphics/GraphicsMagick/patches/patch-configure_ac
index 528728ddaa2..1bbdfdba4f5 100644
--- a/graphics/GraphicsMagick/patches/patch-configure_ac
+++ b/graphics/GraphicsMagick/patches/patch-configure_ac
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2006/10/29 10:53:40 espie Exp $
---- configure.ac.orig	Sat Oct 28 17:30:31 2006
-+++ configure.ac	Sat Oct 28 17:31:00 2006
-@@ -2065,7 +2065,7 @@ AC_SUBST(PERLMAINCC)
+$OpenBSD: patch-configure_ac,v 1.2 2007/09/19 05:58:14 steven Exp $
+--- configure.ac.orig	Wed Sep  5 22:08:48 2007
++++ configure.ac	Tue Sep 18 16:05:43 2007
+@@ -2070,7 +2070,7 @@ AC_SUBST(PERLMAINCC)
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2006/10/29 10:53:40 espie Exp $
  AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where GraphicsMagick architecture dependent files are installed)
  
  # Path to GraphicsMagick bin directory
-@@ -2128,7 +2128,7 @@ AC_SUBST(MagickFilterModulesPath)
+@@ -2133,7 +2133,7 @@ AC_SUBST(MagickFilterModulesPath)
  
  #
  # Path to GraphicsMagick share files
diff --git a/graphics/GraphicsMagick/pkg/PLIST b/graphics/GraphicsMagick/pkg/PLIST
index a157562371b..7acab52ba69 100644
--- a/graphics/GraphicsMagick/pkg/PLIST
+++ b/graphics/GraphicsMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/29 10:53:40 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/09/19 05:58:14 steven Exp $
 %%SHARED%%
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
@@ -125,9 +125,7 @@ share/GraphicsMagick/www/Changelog.html
 share/GraphicsMagick/www/Copyright.html
 share/GraphicsMagick/www/FAQ.html
 share/GraphicsMagick/www/GraphicsMagick.html
-share/GraphicsMagick/www/INSTALL-mac.html
 share/GraphicsMagick/www/INSTALL-unix.html
-share/GraphicsMagick/www/INSTALL-vms.html
 share/GraphicsMagick/www/INSTALL-windows.html
 share/GraphicsMagick/www/ImageMagickObject.html
 share/GraphicsMagick/www/Magick++/