diff --git a/print/pcal/Makefile b/print/pcal/Makefile
index 86976853d74e..29268c66d73b 100644
--- a/print/pcal/Makefile
+++ b/print/pcal/Makefile
@@ -8,40 +8,41 @@
 PORTNAME=	pcal
 PORTVERSION=	4.7.1
 CATEGORIES=	print
-MASTER_SITES=	http://www.sunpoint.net/~pcal/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostScript calendar program
 
-WWWSERVER!=	hostname
+USE_REINPLACE=	yes
+MAKE_ENV=	CC="${CC}" HOST_CC="${CC}" PAPERSIZE="${PAPERSIZE}"
+ALL_TARGET=	pcal
 
 MAN1=		pcal.1
+PLIST_FILES=	bin/pcal libexec/pcal.cgi
+PORTDOCS=	ReadMe pcal.html pcalw.html
+
+WWWSERVER!=	hostname
 
 .include <bsd.port.pre.mk>
 
-MAKE_ENV+=	PAPERSIZE="${PAPERSIZE}"
-MAKE_ENV+=	CC="${CC}" HOST_CC="${CC}"
-
-ALL_TARGET=	pcal
-
-pre-install:
-	${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp
-	${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
-		< ${WRKSRC}/pcal.cgi.tmp > ${WRKSRC}/pcal.cgi
-	${MV} ${WRKSRC}/pcal.html ${WRKSRC}/pcal.html.tmp
-	${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
-		< ${WRKSRC}/pcal.html.tmp > ${WRKSRC}/pcal.html
-	${MV} ${WRKSRC}/pcalw.html ${WRKSRC}/pcalw.html.tmp
-	${SED} -e 's|@@WWWSERVER@@|${WWWSERVER}|' \
-		< ${WRKSRC}/pcalw.html.tmp > ${WRKSRC}/pcalw.html
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/pcal.cgi
+	@${REINPLACE_CMD} -e \
+		's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/pcal.html
+	@${REINPLACE_CMD} -e \
+		's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/pcalw.html
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/man/man1/pcal.1
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/pcal.man ${MANPREFIX}/man/man1/pcal.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ReadMe ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/pcal.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/pcalw.html ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/print/pcal/distinfo b/print/pcal/distinfo
index c56cc1b0ef5e..4910940017eb 100644
--- a/print/pcal/distinfo
+++ b/print/pcal/distinfo
@@ -1 +1,2 @@
-MD5 (pcal-4.7.1.tar.gz) = 85314da2c4616d40a59c80fc4ee807a0
+MD5 (pcal-4.7.1.tar.gz) = 07d8e3b92affc4940c4401d9a8274075
+SIZE (pcal-4.7.1.tar.gz) = 291594
diff --git a/print/pcal/pkg-descr b/print/pcal/pkg-descr
index 2851bddb4d40..9af3ed3afc40 100644
--- a/print/pcal/pkg-descr
+++ b/print/pcal/pkg-descr
@@ -3,7 +3,7 @@ year.  By default, it looks for a file in the home directory named
 "calendar" for entries with leading dates matching dates on the
 calendar, and prints any following text under the appropriate day.
 
-WWW: http://fronzek.akshor.com/pcal/
+WWW: http://pcal.sourceforge.net/
 
 --
 mwest@uct.ac.za
diff --git a/print/pcal/pkg-plist b/print/pcal/pkg-plist
deleted file mode 100644
index 488e30d58346..000000000000
--- a/print/pcal/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/pcal
-libexec/pcal.cgi
-share/doc/pcal/ReadMe
-share/doc/pcal/pcal.html
-share/doc/pcal/pcalw.html
-@dirrm share/doc/pcal