diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 3296b21c63da..350a4baffb47 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -9,15 +9,15 @@
 # png version number) when updating this port.  Thank you.
 
 PORTNAME=	png
-PORTVERSION=    1.0.6
+PORTVERSION=    1.0.7
 CATEGORIES=     graphics
-MASTER_SITES=   ftp://ftp.libpng.org/pub/png/src/
+MASTER_SITES=   ftp://ftp.libpng.org/pub/png/src/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTNAME=       lib${PKGNAME}
 
 PATCH_SITES=    ftp://ftp.libpng.org/pub/png/src/
-PATCHFILES=     libpng-1.0.6-patch-a.txt.gz \
-		libpng-1.0.6-patch-b.txt.gz \
-		libpng-1.0.6-patch-c.txt.gz
+#PATCHFILES=
 
 MAINTAINER=     ache@FreeBSD.org
 
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index f329ed0f9ef8..9ad6694abf41 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,4 +1,4 @@
-MD5 (libpng-1.0.6.tar.gz) = e7801dbd2d9d593c9663efa84f4e9ad7
+MD5 (libpng-1.0.7.tar.gz) = e238fce0af74f4c68a97cf303e01ca96
 MD5 (libpng-1.0.6-patch-a.txt.gz) = 03ba973e3b9110198a7e4965360fe0e1
 MD5 (libpng-1.0.6-patch-b.txt.gz) = de2aad6bd0f03b84d2c013eb8b59e653
 MD5 (libpng-1.0.6-patch-c.txt.gz) = 12ef2b1c2410721ff69dbcdb862cfc3c
diff --git a/graphics/png/pkg-descr b/graphics/png/pkg-descr
index 83df92744185..fb11db4ce311 100644
--- a/graphics/png/pkg-descr
+++ b/graphics/png/pkg-descr
@@ -8,3 +8,4 @@ keeping the code easy to understand.  Currently, this library
 only supports C.  Support for other languages is being considered.
 
 WWW: http://www.libpng.org/pub/png/libpng.html
+     http://libpng.sourceforge.net/
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 484623e6938b..7e2a86c4b47a 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -36,7 +36,7 @@ PCL3_DRV=	hpdj-2.6.tar.gz
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-1.0.6 ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-1.0.7 ${WRKSRC}/libpng
 	# additional PCL3  driver
 	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}
 	@${CAT} ${WRKSRC}/devs.mak-5.10.add >> ${WRKSRC}/devs.mak