diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index f000bb5b4c5f..d5d1b7b68aa1 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bwbasic
 PORTVERSION=	2.20p2
 CATEGORIES=	lang
-# mastersite disappeared in September 2002
-MASTER_SITES=	# ftp://ftp.rahul.net/pub2/rhn/www/files/
+MASTER_SITES=	http://www.nicholson.com/rhn/files/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,12 +23,12 @@ pre-patch:
 	cd ${WRKTOP} && ${MV} bwb-2.20-patch01/* ${WRKSUBDIR}
 	cd ${WRKTOP} && ${MV} bwb-2.20-patch02/* ${WRKSUBDIR}
 
-# This puts the documentation in ${PREFIX}/share/bwbasic, and the
-# test programs in ${PREFIX}/share/bwbasic/bwbtest.
-
+.if !defined(NOPORTDOCS)
 post-install:
-	-${MKDIR} ${PREFIX}/share/bwbasic
-	${CP} ${WRKSRC}/bwbasic.doc ${PREFIX}/share/bwbasic/
-	${CP} -r ${WRKSRC}/bwbtest ${PREFIX}/share/bwbasic/
+	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} ${WRKSRC}/bwbasic.doc ${DOCSDIR}
+	${CP} -r ${WRKSRC}/bwbtest ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/bwbasic/pkg-plist b/lang/bwbasic/pkg-plist
index 9e7c34246c74..2d0c3cd90d37 100644
--- a/lang/bwbasic/pkg-plist
+++ b/lang/bwbasic/pkg-plist
@@ -1,46 +1,47 @@
 bin/bwbasic
-share/bwbasic/bwbasic.doc
-share/bwbasic/bwbtest/abs.bas
-share/bwbasic/bwbtest/assign.bas
-share/bwbasic/bwbtest/callfunc.bas
-share/bwbasic/bwbtest/callsub.bas
-share/bwbasic/bwbtest/chain1.bas
-share/bwbasic/bwbtest/chain2.bas
-share/bwbasic/bwbtest/dataread.bas
-share/bwbasic/bwbtest/deffn.bas
-share/bwbasic/bwbtest/dim.bas
-share/bwbasic/bwbtest/doloop.bas
-share/bwbasic/bwbtest/dowhile.bas
-share/bwbasic/bwbtest/elseif.bas
-share/bwbasic/bwbtest/end.bas
-share/bwbasic/bwbtest/err.bas
-share/bwbasic/bwbtest/fncallfn.bas
-share/bwbasic/bwbtest/fornext.bas
-share/bwbasic/bwbtest/function.bas
-share/bwbasic/bwbtest/gosub.bas
-share/bwbasic/bwbtest/gotolabl.bas
-share/bwbasic/bwbtest/ifline.bas
-share/bwbasic/bwbtest/index.txt
-share/bwbasic/bwbtest/input.bas
-share/bwbasic/bwbtest/lof.bas
-share/bwbasic/bwbtest/loopuntl.bas
-share/bwbasic/bwbtest/main.bas
-share/bwbasic/bwbtest/mlifthen.bas
-share/bwbasic/bwbtest/on.bas
-share/bwbasic/bwbtest/onerr.bas
-share/bwbasic/bwbtest/onerrlbl.bas
-share/bwbasic/bwbtest/ongosub.bas
-share/bwbasic/bwbtest/opentest.bas
-share/bwbasic/bwbtest/option.bas
-share/bwbasic/bwbtest/pascaltr.bas
-share/bwbasic/bwbtest/putget.bas
-share/bwbasic/bwbtest/random.bas
-share/bwbasic/bwbtest/selcase.bas
-share/bwbasic/bwbtest/snglfunc.bas
-share/bwbasic/bwbtest/stop.bas
-share/bwbasic/bwbtest/term.bas
-share/bwbasic/bwbtest/whilwend.bas
-share/bwbasic/bwbtest/width.bas
-share/bwbasic/bwbtest/writeinp.bas
-@dirrm share/bwbasic/bwbtest
-@dirrm share/bwbasic
+%%PORTDOCS%%%%DOCSDIR%%/bwbasic.doc
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/abs.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/assign.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/callfunc.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/callsub.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/chain1.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/chain2.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/dataread.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/deffn.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/dim.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/doloop.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/dowhile.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/elseif.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/end.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/err.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/fncallfn.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/fornext.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/function.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/gosub.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/gotolabl.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/ifline.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/index.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/input.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/lof.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/loopuntl.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/main.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/mlifthen.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/on.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/onerr.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/onerrlbl.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/ongosub.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/opentest.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/option.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/pascaltr.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/putget.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/random.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/selcase.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/snglfunc.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/stop.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/term.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/whilwend.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/width.bas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bwbtest/writeinp.bas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bwbtest
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%