diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 8702792ce8f9..9fd3f7fab386 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -1,66 +1,66 @@
 # New ports collection makefile for:   spambnc
 # Date created:        25 December 2000
 # Whom:                George Reid <greid@ukug.uk.freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	spambnc
-PORTVERSION=	20050527
+PORTVERSION=	20050621
 CATEGORIES=	mail
-MASTER_SITES=	http://www.spambouncer.org/	\
-		ftp://ftp.spambouncer.org/
-DISTFILES=	sb-beta.tar.gz index.shtml
+MASTER_SITES=	http://www.spambouncer.org/dist/sb/:tarball	\
+		http://www.spambouncer.org/configure/:doc
+DISTFILES=	sb.tar.gz:tarball	quickstart.shtml:doc
 DIST_SUBDIR=	spambnc-${PORTVERSION}
-EXTRACT_ONLY=	sb-beta.tar.gz
+EXTRACT_ONLY=	sb.tar.gz
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Set of procmail recipies which handle known/suspected spam
 
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
-IGNOREFILES=	index.shtml
+IGNOREFILES=	quickstart.shtml
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/.pkg-plist
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SUB_DIRS=	functions docs data auxiliary
 
 .if !defined(NOPORTDOCS)
-MASTER_SITES+=	http://www.spambouncer.org/webdev/configure/:upg
+MASTER_SITES+=	http://www.spambouncer.org/configure/:upg
 DISTFILES+=	upgrading.shtml:upg
 IGNOREFILES+=	upgrading.shtml
 .endif
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@(cd ${WRKDIR} && ${FIND} -s . -type f | ${GREP} -v "^\.\/\." | \
 		${SED} -e 's,.,%%DATADIR%%,1' >> ${PLIST})
 .for dd in ${SUB_DIRS}
 	@${ECHO_CMD} "@dirrm %%DATADIR%%/${dd}" >> ${PLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	@${ECHO_CMD} "%%DOCSDIR%%/documentation.html" >> ${PLIST}
 	@${ECHO_CMD} "%%DOCSDIR%%/upgrading.html" >> ${PLIST}
 	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >> ${PLIST}
 .endif
 
 do-install:
 	${MKDIR} ${DATADIR}
 	cd ${WRKDIR} && ${CP} -Rv * ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/index.shtml \
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickstart.shtml \
 		${DOCSDIR}/documentation.html
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/upgrading.shtml \
 		${DOCSDIR}/upgrading.html
 .endif
 
 post-install:
 	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},;s,%%DATADIR%%,${DATADIR},' \
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/spambnc/distinfo b/mail/spambnc/distinfo
index 97cf9cd3a5fd..bdc4396d5ae2 100644
--- a/mail/spambnc/distinfo
+++ b/mail/spambnc/distinfo
@@ -1,4 +1,4 @@
-MD5 (spambnc-20050527/sb-beta.tar.gz) = dcba1fc3fd6980f2f9b74643c627481b
-SIZE (spambnc-20050527/sb-beta.tar.gz) = 574556
-MD5 (spambnc-20050527/index.shtml) = IGNORE
-MD5 (spambnc-20050527/upgrading.shtml) = IGNORE
+MD5 (spambnc-20050621/sb.tar.gz) = 78700aa89b23416099ad483539c2848e
+SIZE (spambnc-20050621/sb.tar.gz) = 678007
+MD5 (spambnc-20050621/quickstart.shtml) = IGNORE
+MD5 (spambnc-20050621/upgrading.shtml) = IGNORE