diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index a57873efa5c5..c6ff26edd7bb 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gd
-PORTVERSION=	0.26
+PORTVERSION=	0.30
 CATEGORIES=	graphics python
 MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,26 +15,19 @@ MAINTAINER=	perky@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
-USE_PYTHON=	yes
-USE_REINPLACE=  yes
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} \
-		EXAMPLE_DIR=${EXAMPLE_DIR:S,^${PREFIX}/,,g}
-EXAMPLE_DIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-
-.if !defined(WITHOUT_X11)
 USE_XPM=	yes
-.endif
+USE_REINPLACE=  yes
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+USE_PYTHON_PREFIX=	yes
+PYSETUP=	Setup.py
+EXAMPLE_DIR=	${PREFIX}/share/examples/py-gd
 
 post-patch:
-	${REINPLACE_CMD} -e 's,^\(gd.*\)$$,\1 -I${LOCALBASE}/include/gd\
-		-L${LOCALBASE}/lib,g' -e 's,-lttf,,g' \
-		-e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Setup
-.if defined(WITHOUT_X11)
-	${REINPLACE_CMD} -e 's,-lX11 -lXpm,,g' ${WRKSRC}/Setup
-.endif
-
-pre-build:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.pre.in boot
+	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
+		-e 's,/usr/X11R6,${X11BASE},g' \
+		-e 's,/usr/include/X11,${LOCALBASE}/include/gd,g' \
+		${WRKSRC}/${PYSETUP}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/py-gd/distinfo b/graphics/py-gd/distinfo
index 41a5d0ce2ae0..fe9b5b77c6b0 100644
--- a/graphics/py-gd/distinfo
+++ b/graphics/py-gd/distinfo
@@ -1 +1 @@
-MD5 (gdmodule-0.26.tar.gz) = fc171fa4cab20a73b8c4d073c2f753f4
+MD5 (gdmodule-0.30.tar.gz) = f115abf398674725e21ccc61bc3702da
diff --git a/graphics/py-gd/pkg-plist b/graphics/py-gd/pkg-plist
index ec5ea608efd4..e1c1b8810e39 100644
--- a/graphics/py-gd/pkg-plist
+++ b/graphics/py-gd/pkg-plist
@@ -1,3 +1,6 @@
-%%PYTHON_SITELIBDIR%%/gdmodule.so
-%%PORTDOCS%%%%EXAMPLE_DIR%%/gddemo.py
-%%PORTDOCS%%@dirrm %%EXAMPLE_DIR%%
+%%PYTHON_SITELIBDIR%%/_gd.so
+%%PYTHON_SITELIBDIR%%/gd.py
+%%PYTHON_SITELIBDIR%%/gd.pyc
+%%PYTHON_SITELIBDIR%%/gd.pyo
+%%PORTDOCS%%share/examples/py-gd/gddemo.py
+%%PORTDOCS%%@dirrm share/examples/py-gd