diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index daa14a1531f..bad71fc5834 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,16 +1,26 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1999/02/21 23:28:05 brad Exp $
+# $OpenBSD: Makefile,v 1.2 1999/07/26 00:36:34 brad Exp $
 # $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $
 
-DISTNAME=       gd1.3
-PKGNAME=        gd-1.3
+DISTNAME=	gd-1.6.2
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://www.boutell.com/pub/boutell/gd/
+MASTER_SITES=	http://www.boutell.com/gd/http/ \
+		ftp://ftp.boutell.com/pub/boutell/gd/
+
+NEED_VERSION=	1.73
+
+LIB_DEPENDS=	png.1.3:${PORTSDIR}/graphics/png
 
 MAINTAINER=	brad@openbsd.org
 HOMEPAGE=	http://www.boutell.com/gd/
 
-pre-install:
-	${MKDIR} ${PREFIX}/include/gd
-	${MKDIR} ${PREFIX}/share/examples/gd
+SEPARATE_BUILD=	concurrent
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static
+
+post-install:
+	@${MKDIR} ${PREFIX}/share/examples/gd
+	${INSTALL_DATA} ${WRKSRC}/demoin.png ${PREFIX}/share/examples/gd
+	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/examples/gd
 
 .include <bsd.port.mk>
diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5
index 0c7d80c6c62..e0c2d7ba90a 100644
--- a/graphics/gd/files/md5
+++ b/graphics/gd/files/md5
@@ -1,3 +1,3 @@
-MD5 (gd1.3.tar.gz) = ff3de2c851c4b1fc6af6f14dcfbc6532
-RMD160 (gd1.3.tar.gz) = 8ee4fba761ddb874f7df7b84454ffc2f970f9e28
-SHA1 (gd1.3.tar.gz) = f001948cfc988cd6b8214fb34985987a2d535920
+MD5 (gd-1.6.2.tar.gz) = 672bf9bbdfb6d94cf506db2dac2b6fc4
+RMD160 (gd-1.6.2.tar.gz) = 9ccf541102180650e5a137bc108b4fcf3bcd95c5
+SHA1 (gd-1.6.2.tar.gz) = 6d86544a5dc60b9947504f3ddcfa7a71aefc1b39
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index dd76fe463c2..d6bcc47680e 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,28 +1,25 @@
---- Makefile.orig	Tue Aug  8 14:28:27 1995
-+++ Makefile	Sat Jun 14 18:19:04 1997
-@@ -7,9 +7,9 @@
- #If the ar command fails on your system, consult the ar manpage
- #for your system. 
+--- Makefile.in.orig	Fri Jul 23 18:13:22 1999
++++ Makefile.in	Sun Jul 25 15:56:58 1999
+@@ -88,7 +88,7 @@
+ libgd_la_SOURCES = gd.c gd_io.c gd_io_file.c gd_io_dp.c gd_io_ss.c 	gd_png.c gd_ss.c gd_gd.c gd_gd2.c gdfontt.c gdfonts.c gdfontmb.c 	gdfontl.c gdfontg.c gdttf.c gdcache.c 	gd.h gdcache.h gdfontl.h gdfonts.h gd_io.h gdfontg.h 	gdfontmb.h gdfontt.h
  
--CC=gcc 
--AR=ar
--CFLAGS=-O
-+#CC=gcc 
-+#AR=ar
-+#CFLAGS=-O
- LIBS=-L./ -lgd -lm
  
- all: libgd.a gddemo giftogd webgif
-@@ -32,3 +32,11 @@
- clean:
- 	rm -f *.o *.a gddemo giftogd 
+-libgd_la_LIBADD = @LIBS@ -lm
++libgd_la_LIBADD = @LIBS@ -lm -L$(libdir) -lpng
  
-+install:
-+	install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin
-+	install -c -o bin -g bin libgd.a ${PREFIX}/lib
-+	install -c -o bin -g bin gd.h gdfonts.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin gdfontt.h gdfontmb.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin gdfontl.h gdfontg.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin index.html ${PREFIX}/share/examples/gd
-+	install -c -o bin -g bin demoin.gif ${PREFIX}/share/examples/gd
-
+ bin_PROGRAMS = pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
+ 
+@@ -138,11 +138,11 @@
+ LTLIBRARIES =  $(lib_LTLIBRARIES)
+ 
+ 
+-DEFS = @DEFS@ -I. -I$(srcdir) 
++DEFS = @DEFS@ -I. -I$(srcdir) -I$(includedir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libgd_la_LDFLAGS = 
++libgd_la_LDFLAGS = -version-info 1:6:0
+ libgd_la_DEPENDENCIES = 
+ libgd_la_OBJECTS =  gd.lo gd_io.lo gd_io_file.lo gd_io_dp.lo gd_io_ss.lo \
+ gd_png.lo gd_ss.lo gd_gd.lo gd_gd2.lo gdfontt.lo gdfonts.lo gdfontmb.lo \
diff --git a/graphics/gd/pkg/COMMENT b/graphics/gd/pkg/COMMENT
index 4cacd054e28..b505900641d 100644
--- a/graphics/gd/pkg/COMMENT
+++ b/graphics/gd/pkg/COMMENT
@@ -1 +1 @@
-graphics library for fast GIF creation
+graphics library for fast PNG creation
diff --git a/graphics/gd/pkg/DESCR b/graphics/gd/pkg/DESCR
index 1a944ea8d54..7b070e8ddbb 100644
--- a/graphics/gd/pkg/DESCR
+++ b/graphics/gd/pkg/DESCR
@@ -1,19 +1,19 @@
 DESCRIPTION
 	gd is a graphics library. It allows your code to quickly draw images
 	complete with lines, arcs, text, multiple colors, cut and paste from
-	other images, and flood fills, and write out the result as a .GIF file.
-	This is particularly useful in World Wide Web applications, where .GIF
-	is the format used for inline images. 
+	other images, and flood fills, and write out the result as a .PNG file.
+	This is particularly useful in World Wide Web applications, where .PNG
+	is one of the formats accepted for inline images by most browsers.
 
-	gd is not a paint program. If you are looking for a paint program, try 
-	xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com
-	in pub/ko/koblas. (That package is for the X Window System; for the Mac
-	and the PC, paint programs are considerably easier to find.) 
+	gd is not a paint program. If you are looking for a paint program, you
+	are looking in the wrong place. If you are not a programmer, you are
+	looking in the wrong place.
 
 	gd does not provide for every possible desirable graphics operation. It
 	is not necessary or desirable for gd to become a kitchen-sink graphics
-	package, but version 1.3 incorporates most of the commonly requested 
-	features for a 2D package. 
+	package, but version 1.6.2 incorporates most of the commonly requested
+	features for an 8-bit 2D package. Support for scalable fonts, and
+	truecolor images, JPEG and truecolor PNG is planned for version 2.0.
+
 AUTHOR
-	gd 1.3 was written by Thomas Boutell and is currently distributed by 
-	boutell.com, Inc.
+	gd was written by Thomas Boutell and is distributed by boutell.com, Inc.
diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST
index 20dd72e9d3f..7a48ab469f7 100644
--- a/graphics/gd/pkg/PLIST
+++ b/graphics/gd/pkg/PLIST
@@ -1,14 +1,21 @@
-bin/gddemo
-bin/giftogd
-bin/webgif
-include/gd/gd.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
+bin/pngtogd
+bin/pngtogd2
+bin/gdtopng
+bin/gd2topng
+bin/gd2copypal
+bin/gdparttopng
+bin/webpng
+include/gd.h
+include/gd_io.h
+include/gdfontt.h
+include/gdfonts.h
+include/gdfontmb.h
+include/gdfontl.h
+include/gdfontg.h
 lib/libgd.a
-share/examples/gd/demoin.gif
+lib/libgd.la
+lib/libgd.so.1.6
+@exec /sbin/ldconfig -m %B/lib
+share/examples/gd/demoin.png
 share/examples/gd/index.html
-@dirrm include/gd
 @dirrm share/examples/gd