diff --git a/www/grail/Makefile b/www/grail/Makefile
index 3769a26acc36..bac5bcfbd51f 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -5,21 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=		grail
-PORTVERSION= 		0.6
-CATEGORIES=		www python
-MASTER_SITES=		http://grail.cnri.reston.va.us/grail/source/
-DISTFILES=		${PORTNAME}-06.tgz
+PORTNAME=	grail
+PORTVERSION= 	0.6
+CATEGORIES=	www python
+MASTER_SITES=	http://grail.sourceforge.net/source/ \
+		http://grail.cnri.reston.va.us/grail/source/
+DISTFILES=	${PORTNAME}-06.tgz
 
-MAINTAINER=		nectar@freebsd.org
+MAINTAINER=	nectar@freebsd.org
 
-USE_PYTHON=		yes
-RUN_DEPENDS=		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+USE_PYTHON=	yes
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-GRAILSUBDIR=		share/grail
-GRAILDIR=		${PREFIX}/${GRAILSUBDIR}
-DIRS_CMD=		${SED} -e '/^@dirrm/bok' -e 'D' -e ':ok' -e 's,@dirrm ,,' < ${PLIST}
-FILES_CMD=		${SED} -e '/^share\//bok' -e 'D' -e ':ok' -e 's,${GRAILSUBDIR}/,,' < ${PLIST}
+GRAILSUBDIR=	share/grail
+GRAILDIR=	${PREFIX}/${GRAILSUBDIR}
+DIRS_CMD=	${SED} -e '/^@dirrm/bok' -e 'D' -e ':ok' -e 's,@dirrm ,,' < ${PLIST}
+FILES_CMD=	${SED} -e '/^share\//bok' -e 'D' -e ':ok' -e 's,${GRAILSUBDIR}/,,' < ${PLIST}
 
 FIND?=find
 PYTHON?=python
diff --git a/www/grail/pkg-descr b/www/grail/pkg-descr
index 8cc9b0851c52..d47718e875d0 100644
--- a/www/grail/pkg-descr
+++ b/www/grail/pkg-descr
@@ -1,5 +1,3 @@
-From http://grail.cnri.reston.va.us/grail/
-
 	Grail is an extensible Internet browser. It supports the
 	protocols and file formats commonly found on the World-Wide
 	Web, such as HTTP, FTP, and HTML, but, unlike most browsers,
@@ -18,5 +16,6 @@ From http://grail.cnri.reston.va.us/grail/
 	there are now stable ports of Tk to those platforms. (You need
 	a lot of RAM though.)
 
+WWW: http://grail.sourceforge.net/
+
 Jacques Vidrine <n@nectar.com>
-WWW: http://grail.cnri.reston.va.us/grail/