diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index f787045b1ce..2ccbcd84df6 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/11/16 07:33:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2010/11/16 09:17:55 jasper Exp $
 
 COMMENT=	virus/spam scanning framework
 
@@ -103,7 +103,6 @@ install_share:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/MailScanner
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/MailScanner
 	@${INST_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/MailScanner/README
-	@${INST_DATA} ${FILESDIR}/README.OpenBSD.port ${PREFIX}/share/doc/MailScanner/README.OpenBSD.port
 	@cd ${WRKSRC}/etc ; find reports -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}'/share/examples/MailScanner/{}' \;
 	@cd ${WRKSRC}/etc ; find reports -type f ! -name "*.orig" | while read f; do ${INST_DATA} $$f ${PREFIX}/share/examples/MailScanner/$$f; done
 	@cd ${PREFIX}/share/examples/MailScanner/reports ; find . -name "*.bak" -print0 | xargs -0 rm -f
diff --git a/mail/mailscanner/pkg/MESSAGE b/mail/mailscanner/pkg/MESSAGE
deleted file mode 100644
index 128279f3656..00000000000
--- a/mail/mailscanner/pkg/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-See ${PREFIX}/share/doc/MailScanner/README.OpenBSD.port,
-http://www.mailscanner.info, and the sample configuration
-files in ${SYSCONFDIR}/MailScanner for further instructions.
-
-You will need to make several modifications to your startup
-routines, documented in the README.OpenBSD.port file above
-before this software is activated.
diff --git a/mail/mailscanner/pkg/PLIST b/mail/mailscanner/pkg/PLIST
index 56c9083fca1..a2294c42e6b 100644
--- a/mail/mailscanner/pkg/PLIST
+++ b/mail/mailscanner/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2010/06/18 21:48:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.12 2010/11/16 09:17:55 jasper Exp $
 @conflict clamav-<0.94
 bin/MailScanner
 bin/Quick.Peek
@@ -73,7 +73,7 @@ libexec/MailScanner/MailScanner
 share/MailScanner/
 share/doc/MailScanner/
 share/doc/MailScanner/README
-share/doc/MailScanner/README.OpenBSD.port
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/MailScanner/
 @sample ${SYSCONFDIR}/MailScanner/
 share/examples/MailScanner/MailScanner.conf
diff --git a/mail/mailscanner/files/README.OpenBSD.port b/mail/mailscanner/pkg/README
similarity index 60%
rename from mail/mailscanner/files/README.OpenBSD.port
rename to mail/mailscanner/pkg/README
index 2e2e957d309..a626a7e82d6 100644
--- a/mail/mailscanner/files/README.OpenBSD.port
+++ b/mail/mailscanner/pkg/README
@@ -1,3 +1,5 @@
+$OpenBSD: README,v 1.1 2010/11/16 09:17:55 jasper Exp $
+
 The MailScanner port is using the original MailScanner tarball from 
 www.mailscanner.info. This tarball puts all the MailScanner files in 
 subdirectories
@@ -11,14 +13,17 @@ var	pid file
 In order to make this OpenBSD compliant the port installs those files
 in the following directories:
 
-/usr/local/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
-/usr/local/lib/MailScanner	MailScanner Perl libraries
-/usr/local/share/MailScanner	MailScanner report templates
-/usr/local/share/doc/MailScanner	Documentation
-/usr/local/share/examples/MailScanner	Example files
-/etc/MailScanner		MailScanner config files / rules
+${TRUEPREFIX}/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
+${TRUEPREFIX}/lib/MailScanner		MailScanner Perl libraries
+${TRUEPREFIX}/share/MailScanner		MailScanner report templates
+${TRUEPREFIX}/share/doc/MailScanner	Documentation
+${TRUEPREFIX}/share/examples/MailScanner Example files
+${SYSCONFDIR}/MailScanner		MailScanner config files / rules
 
-To activate this port, you must do the following for sendmail:
+See http://www.mailscanner.info  and the sample configuration
+files in ${SYSCONFDIR}/MailScanner for further instructions.
+
+To activate this package, you must do the following for sendmail:
 
 1. Set the following in your sendmail.mc file:
 
@@ -48,11 +53,11 @@ To activate this port, you must do the following for sendmail:
   fi
 
   # MailScanner outbound queue
-  if [ -x /usr/local/bin/check_mailscanner ]; then
-        echo -n ' MailScanner'; /usr/local/bin/check_mailscanner
+  if [ -x ${TRUEPREFIX}/bin/check_mailscanner ]; then
+        echo -n ' MailScanner'; ${TRUEPREFIX}/bin/check_mailscanner
   fi
 
 4. Add the following to root's crontab:
 
   # Check the status of MailScanner every hour
-  0       *       *       *       *       /usr/local/bin/check_mailscanner -q
+  0       *       *       *       *       ${TRUEPREFIX}/bin/check_mailscanner -q