diff --git a/www/cgichk/Makefile b/www/cgichk/Makefile
index 30e65d19e1cc..1aec7a697518 100644
--- a/www/cgichk/Makefile
+++ b/www/cgichk/Makefile
@@ -1,29 +1,28 @@
 # Created by: Mark Pulford <mark@kyne.com.au>
 # $FreeBSD$
 
 PORTNAME=	cgichk
 PORTVERSION=	2.60
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://BSDforge.com/projects/source/www/cgichk/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Web site vulnerability scanner
+LICENSE=	GPLv2
 
-BROKEN=		unfetchable
+MAINTAINER=	portmaster@BSDforge.com
+COMMENT=	Web site vulnerability scanner
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	cgichk
 
 post-patch:
 	${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e \
 		"s@/etc/@${PREFIX}/etc/@g; s/#include <getopt.h>//g;" \
 		${WRKSRC}/cgichk.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cgichk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/cgichk.cfg ${STAGEDIR}${PREFIX}/etc/cgichk.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/www/cgichk/distinfo b/www/cgichk/distinfo
index 9c0013f08f2d..8cd4496a84f3 100644
--- a/www/cgichk/distinfo
+++ b/www/cgichk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cgichk_2.60.tar.gz) = 4d52fd7692c65eb1e4e009982f29eac1e0d98714418c0f16d4d41de5de181e62
-SIZE (cgichk_2.60.tar.gz) = 15972
+SHA256 (cgichk-2.60.tar.gz) = 4d52fd7692c65eb1e4e009982f29eac1e0d98714418c0f16d4d41de5de181e62
+SIZE (cgichk-2.60.tar.gz) = 15972