diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index d0eecf990808..913032caa689 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	gotmail
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A script to fetch mail from a Hotmail or MSN mailbox
diff --git a/mail/gotmail/pkg-plist b/mail/gotmail/pkg-plist
index 50a4bf01eb7e..24fb432d7d36 100644
--- a/mail/gotmail/pkg-plist
+++ b/mail/gotmail/pkg-plist
@@ -1,5 +1,5 @@
 bin/gotmail
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README
-%%DOCSDIR%%/sample.gotmailrc
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/sample.gotmailrc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%