diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index fcd5fb60b09..8e2822f7afe 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/08 21:08:43 bluhm Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/12 16:10:17 jasper Exp $
 
 COMMENT =	mailing list manager with web interface
 
 DISTNAME =	sympa-6.0.1
-PKGNAME =	${DISTNAME}p0
+REVISION =	1
 CATEGORIES =	mail www
 
 HOMEPAGE =	http://www.sympa.org
@@ -15,7 +15,8 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =	Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =		${HOMEPAGE}/distribution/
+MASTER_SITES =		${HOMEPAGE}/distribution/ \
+			http://distfiles.nl/
 
 MODULES =	perl
 USE_GMAKE =	Yes
@@ -83,8 +84,5 @@ post-install:
 		${PREFIX}/sbin/sympa_wizard.pl --create sympa.conf \
 		--target ${PREFIX}/share/examples/sympa/sympa.conf
 	mv ${PREFIX}/bin/create_db.* ${PREFIX}/share/examples/sympa/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sympa/
-	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/sympa/README.OpenBSD
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/sympa
 
 .include <bsd.port.mk>
diff --git a/mail/sympa/pkg/MESSAGE b/mail/sympa/pkg/MESSAGE
deleted file mode 100644
index d63777bc590..00000000000
--- a/mail/sympa/pkg/MESSAGE
+++ /dev/null
@@ -1,2 +0,0 @@
-To complete the installation or update, make sure you read
-    ${PREFIX}/share/doc/sympa/README.OpenBSD
diff --git a/mail/sympa/pkg/PLIST b/mail/sympa/pkg/PLIST
index 3779973a17f..560fc826241 100644
--- a/mail/sympa/pkg/PLIST
+++ b/mail/sympa/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/03/27 11:49:55 landry Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/11/12 16:10:17 jasper Exp $
 @newgroup _sympa:648
 @newuser _sympa:648:648:daemon:Sympa Daemon:/var/empty:/sbin/nologin
 bin/arc2webarc.pl
@@ -92,8 +92,7 @@ sbin/sympa
 sbin/sympa.pl
 sbin/sympa_wizard.pl
 sbin/task_manager.pl
-share/doc/sympa/
-share/doc/sympa/README.OpenBSD
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/sympa/
 share/examples/sympa/create_db.Oracle
 share/examples/sympa/create_db.Pg
diff --git a/mail/sympa/files/README.OpenBSD b/mail/sympa/pkg/README
similarity index 98%
rename from mail/sympa/files/README.OpenBSD
rename to mail/sympa/pkg/README
index 4362864440d..1f21ec14ee3 100644
--- a/mail/sympa/files/README.OpenBSD
+++ b/mail/sympa/pkg/README
@@ -1,3 +1,5 @@
+$OpenBSD: README,v 1.1 2010/11/12 16:10:17 jasper Exp $
+
 SYMPA is now installed, and sample configuration files were created in
 ${SYSCONFDIR}/sympa.conf and ${SYSCONFDIR}/wwsympa.conf