diff --git a/astro/sattrack/pkg/MESSAGE b/astro/sattrack/pkg/MESSAGE
index 6c93305a8cd..1b4b3e176bb 100644
--- a/astro/sattrack/pkg/MESSAGE
+++ b/astro/sattrack/pkg/MESSAGE
@@ -1,4 +1,3 @@
-###
 SatTrack V3.1.6
 Copyright (c) 1992-1997 Bester Tracking Systems. All Rights Reserved.
 
@@ -10,4 +9,3 @@ NOTE:  A license is not required for private, non-commercial use.
 Purchasing the OpenBSD CD-ROM does not entitle the user to use
 SatTrack or parts of it commercially.  Commercial usage of SatTrack
 must be licensed by Bester Tracking Systems.
-###
diff --git a/astro/xephem/pkg/MESSAGE b/astro/xephem/pkg/MESSAGE
index e4161371982..11326e9c7b7 100644
--- a/astro/xephem/pkg/MESSAGE
+++ b/astro/xephem/pkg/MESSAGE
@@ -1,6 +1,5 @@
-
-*** The initial auxil, catalogs, and tools files have
-*** been placed in ${PREFIX}/lib/X11/xephem.  Move them
-*** where you will.  Once moved you MUST modify
-*** ${PREFIX}/lib/X11/app-defaults/XEphem
-*** At a minimum you must change XEphem.BaseDir.
+The initial auxil, catalogs, and tools files have
+been placed in ${PREFIX}/lib/X11/xephem.  Move them
+where you will.  Once moved you MUST modify
+${PREFIX}/lib/X11/app-defaults/XEphem
+At a minimum you must change XEphem.BaseDir.
diff --git a/comms/efax/pkg/MESSAGE b/comms/efax/pkg/MESSAGE
index 81df369bab5..8ba3d6413f8 100644
--- a/comms/efax/pkg/MESSAGE
+++ b/comms/efax/pkg/MESSAGE
@@ -1,5 +1,3 @@
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
 Before use, you MUST customize the "fax" script slightly. In
 particular, you must set the device name (normally cua00 on a
 workstation, cua01 on a PC with a serial mouse).
@@ -15,5 +13,3 @@ one of the files named in CONFIGFILES (by default,
 CONFIGFILES="/etc/efax.rc ${HOME:-~}/.efaxrc ./.efaxrc") to obviate
 the need to change these settings should you reinstall future
 versions of this package.
-
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
diff --git a/devel/chora/pkg/MESSAGE b/devel/chora/pkg/MESSAGE
index b90f8ae4f2c..82aa06a492b 100644
--- a/devel/chora/pkg/MESSAGE
+++ b/devel/chora/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 ${HORDE_NAME} has been installed into ${INSTDIR}/${HORDE_MODULE}
 
 Proceed to complete the installation by reading:
@@ -6,4 +5,3 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
 
 Before installing ${HORDE_NAME}, make sure that Horde is correctly
 configured and working first!
-==============================================================
diff --git a/devel/horde/pkg/MESSAGE b/devel/horde/pkg/MESSAGE
index 50498ed9017..2db6a196c21 100644
--- a/devel/horde/pkg/MESSAGE
+++ b/devel/horde/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 The Horde Application Framework has been installed into
 ${INSTDIR}
 
@@ -11,5 +10,3 @@ ${INSTDIR}/docs/INSTALL
 
 You can ensure you have a working install by accessing:
 http://<localhost>/horde/test.php
-
-==============================================================
diff --git a/devel/jdk/1.4-linux/pkg/MESSAGE b/devel/jdk/1.4-linux/pkg/MESSAGE
index 26569e4464f..1eac71e1000 100644
--- a/devel/jdk/1.4-linux/pkg/MESSAGE
+++ b/devel/jdk/1.4-linux/pkg/MESSAGE
@@ -1,5 +1,3 @@
-==============================================================
 In order to invoke the JVM, the data segment size by your
 'limit' builtin must be at least 262144.
 Please refer to your shell's manual page for details.
-==============================================================
diff --git a/devel/p5-Curses-Widgets/pkg/MESSAGE b/devel/p5-Curses-Widgets/pkg/MESSAGE
index 0818f70b28e..dc5d1bd0df3 100644
--- a/devel/p5-Curses-Widgets/pkg/MESSAGE
+++ b/devel/p5-Curses-Widgets/pkg/MESSAGE
@@ -1,8 +1,5 @@
-==============================================================
 A demo of the Curses-Widgets library in action has been copied
 to ${PREFIX}/share/examples/p5-Curses-Widgets/demo.pl
 
 Run it now to see the capabilities of the library, and make
 sure installation has been successful.
-==============================================================
-
diff --git a/mail/courier-imap/pkg/MESSAGE b/mail/courier-imap/pkg/MESSAGE
index b953c68f654..44a43abbaff 100644
--- a/mail/courier-imap/pkg/MESSAGE
+++ b/mail/courier-imap/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 Example config files for Courier-IMAP have been installed
 in ${PREFIX}/share/examples/courier-imap.
 
@@ -21,4 +20,3 @@ ${PREFIX}/libexec/authlib/authdaemond start
 
 If you require userdb or quota support, then install the
 courier-utils package.
-==============================================================
diff --git a/mail/courier-imap/pkg/MESSAGE-pop3 b/mail/courier-imap/pkg/MESSAGE-pop3
index f67d711e60c..bcbf69bb884 100644
--- a/mail/courier-imap/pkg/MESSAGE-pop3
+++ b/mail/courier-imap/pkg/MESSAGE-pop3
@@ -1,8 +1,6 @@
-==============================================================
 You now need to copy the Courier-POP3 configuration files to
 ${COURIERCONF} from ${PREFIX}/share/examples/courier-imap
 and edit them appropriately.
 
 To use POP3-SSL, be sure to read ssl(8) and run the
 mkpop3dcert script if you require a self-signed certificate
-==============================================================
diff --git a/mail/imp/pkg/MESSAGE b/mail/imp/pkg/MESSAGE
index 3de1c9feb22..82aa06a492b 100644
--- a/mail/imp/pkg/MESSAGE
+++ b/mail/imp/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 ${HORDE_NAME} has been installed into ${INSTDIR}/${HORDE_MODULE}
 
 Proceed to complete the installation by reading:
@@ -6,5 +5,3 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
 
 Before installing ${HORDE_NAME}, make sure that Horde is correctly
 configured and working first!
-
-==============================================================
diff --git a/mail/maildrop/pkg/MESSAGE b/mail/maildrop/pkg/MESSAGE
index bd995cbb280..f8d698caf9d 100644
--- a/mail/maildrop/pkg/MESSAGE
+++ b/mail/maildrop/pkg/MESSAGE
@@ -1,5 +1,3 @@
-
-==============================================================
 The documentation for maildrop has been installed in
 ${PREFIX}/share/doc/maildrop.
 
@@ -11,5 +9,3 @@ may need for correct operation.
 There are currently NO setuid/gid bits enabled, but if you
 use maildrop in certain capacities, these will need to be
 set to allow maildrop to function correctly.
-==============================================================
-
diff --git a/misc/amanda/pkg/MESSAGE b/misc/amanda/pkg/MESSAGE
index 5009656c6fa..528f1321b6e 100644
--- a/misc/amanda/pkg/MESSAGE
+++ b/misc/amanda/pkg/MESSAGE
@@ -1,20 +1,18 @@
-**
-** In order to update /etc/services and /etc/inetd.conf, run
-**
-**    ${PREFIX}/libexec/amanda/patch-system --enable-index --enable-tape
-**
-** You should check both of these files, verifying proper installation.
-** Once verified issue the command:
-**
-**    kill -HUP `cat /var/run/inetd.pid`
-**
-** You also need to create /operator/.amandahosts, which will contain
-** the FQDN of the tape server.  The contents should look like this:
-**
-**    backup.openbsd.org amanda
-**
-** The permissions of /operator/.amandahosts must be restricted:
-**
-**    chmod u=rw /operator/.amandahosts
-**    chown operator:operator /operator/.amandahosts
-**
+In order to update /etc/services and /etc/inetd.conf, run
+
+   ${PREFIX}/libexec/amanda/patch-system --enable-index --enable-tape
+
+You should check both of these files, verifying proper installation.
+Once verified issue the command:
+
+   kill -HUP `cat /var/run/inetd.pid`
+
+You also need to create /operator/.amandahosts, which will contain
+the FQDN of the tape server.  The contents should look like this:
+
+   backup.openbsd.org amanda
+
+The permissions of /operator/.amandahosts must be restricted:
+
+   chmod u=rw /operator/.amandahosts
+   chown operator:operator /operator/.amandahosts
diff --git a/misc/amanda/pkg/MESSAGE-client b/misc/amanda/pkg/MESSAGE-client
index 6d1980654d5..490977784b0 100644
--- a/misc/amanda/pkg/MESSAGE-client
+++ b/misc/amanda/pkg/MESSAGE-client
@@ -1,20 +1,18 @@
-**
-** In order to update /etc/services and /etc/inetd.conf, run
-**
-**    ${PREFIX}/libexec/amanda/patch-system --disable-index --disable-tape
-**
-** You should check both of these files, verifying proper installation.
-** Once verified issue the command:
-**
-**    kill -HUP `cat /var/run/inetd.pid`
-**
-** You also need to create /operator/.amandahosts, which will contain
-** the FQDN of the tape server.  The contents should look like this:
-**
-**    backup.openbsd.org amanda
-**
-** The permissions of /operator/.amandahosts must be restricted:
-**
-**    chmod u=rw /operator/.amandahosts
-**    chown operator:operator /operator/.amandahosts
-**
+In order to update /etc/services and /etc/inetd.conf, run
+
+   ${PREFIX}/libexec/amanda/patch-system --disable-index --disable-tape
+
+You should check both of these files, verifying proper installation.
+Once verified issue the command:
+
+   kill -HUP `cat /var/run/inetd.pid`
+
+You also need to create /operator/.amandahosts, which will contain
+the FQDN of the tape server.  The contents should look like this:
+
+   backup.openbsd.org amanda
+
+The permissions of /operator/.amandahosts must be restricted:
+
+   chmod u=rw /operator/.amandahosts
+   chown operator:operator /operator/.amandahosts
diff --git a/net/ipaudit/pkg/MESSAGE b/net/ipaudit/pkg/MESSAGE
index 8f15fb0a211..f4948e2e35f 100644
--- a/net/ipaudit/pkg/MESSAGE
+++ b/net/ipaudit/pkg/MESSAGE
@@ -1,5 +1,3 @@
-=====================================================
- Altough the use of it it's not required, an example 
- file for IPaudit has been installed on
- ${PREFIX}/share/examples/ipaudit
-=====================================================
+Altough the use of it it's not required, an example 
+file for IPaudit has been installed on
+${PREFIX}/share/examples/ipaudit
diff --git a/net/maradns/devel/pkg/MESSAGE b/net/maradns/devel/pkg/MESSAGE
index d8591a6e35a..f234e9471b3 100644
--- a/net/maradns/devel/pkg/MESSAGE
+++ b/net/maradns/devel/pkg/MESSAGE
@@ -1,9 +1,4 @@
-===============================================================
-
 A complete set of documentation for MaraDNS has been installed
 in ${PREFIX}/share/doc/maradns-devel
 It contains a FAQ, configuration examples and full instructions 
 on how to setup MaraDNS.
-
-===============================================================
-
diff --git a/net/maradns/stable/pkg/MESSAGE b/net/maradns/stable/pkg/MESSAGE
index 146dd9d64bf..82c3a6839a1 100644
--- a/net/maradns/stable/pkg/MESSAGE
+++ b/net/maradns/stable/pkg/MESSAGE
@@ -1,9 +1,4 @@
-===============================================================
-
 A complete set of documentation for MaraDNS has been installed
 in ${PREFIX}/share/doc/maradns
 It contains a FAQ, configuration examples and full instructions 
 on how to setup MaraDNS.
-
-===============================================================
-
diff --git a/net/wide-dhcp/pkg/MESSAGE b/net/wide-dhcp/pkg/MESSAGE
index 63d0f4a67b1..80adbe0c56c 100644
--- a/net/wide-dhcp/pkg/MESSAGE
+++ b/net/wide-dhcp/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 You may need to add these entries to your /etc/services file 
 to register the dhcp services:
 
@@ -11,5 +10,3 @@ Examples and documentation are in:
  ${PREFIX}/share/doc/wide-dhcp , and
  ${PREFIX}/share/examples/wide-dhcp
 
-==============================================================
-
diff --git a/net/yafc/pkg/MESSAGE b/net/yafc/pkg/MESSAGE
index f3d45bcfb06..f89c9294a9c 100644
--- a/net/yafc/pkg/MESSAGE
+++ b/net/yafc/pkg/MESSAGE
@@ -1,9 +1,6 @@
-==============================================================
 A sample configuration file for Yafc has been installed into
 ${PREFIX}/share/examples/yafc/yafcrc.sample
 
 You can copy this file to /etc to establish a default set of 
 options for Yafc.  If it is not present here, Yafc will also
 attempt to find it in ~/.yafc/yafcrc
-==============================================================
-
diff --git a/sysutils/LPRng/pkg/MESSAGE b/sysutils/LPRng/pkg/MESSAGE
index 4a5964103f3..5b5fb33e44d 100644
--- a/sysutils/LPRng/pkg/MESSAGE
+++ b/sysutils/LPRng/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==========================================================================
 To activate the new printing system do the following:
 
 - Copy these config files from ${PREFIX}/share/examples/LPRng
@@ -19,4 +18,3 @@ fi
 
 For further information, have a look at:
   ${PREFIX}/share/doc/LPRng
-==========================================================================
diff --git a/sysutils/lsof/pkg/MESSAGE b/sysutils/lsof/pkg/MESSAGE
index 35c5f657fcb..e0d34d22677 100644
--- a/sysutils/lsof/pkg/MESSAGE
+++ b/sysutils/lsof/pkg/MESSAGE
@@ -1,5 +1,3 @@
-*****
-* If you wish to allow lsof to be used by other than root you must
-* make it sgid to the group kmem.  However, the code has NOT been
-* audited... you have been warned.
-*****
+If you wish to allow lsof to be used by other than root you must
+make it sgid to the group kmem.  However, the code has NOT been
+audited... you have been warned.
diff --git a/textproc/docbook-dsssl/pkg/MESSAGE b/textproc/docbook-dsssl/pkg/MESSAGE
index d0552ab4e60..0e40306ba36 100644
--- a/textproc/docbook-dsssl/pkg/MESSAGE
+++ b/textproc/docbook-dsssl/pkg/MESSAGE
@@ -1,5 +1,2 @@
-==============================================================
 A complete set of documentation for the modular stylesheets
 is in ${PREFIX}/share/doc/docbook-dsssl
-==============================================================
-
diff --git a/textproc/p5-XML-RSS/pkg/MESSAGE b/textproc/p5-XML-RSS/pkg/MESSAGE
index 358e87273b6..cfc8f8db8fc 100644
--- a/textproc/p5-XML-RSS/pkg/MESSAGE
+++ b/textproc/p5-XML-RSS/pkg/MESSAGE
@@ -1,5 +1,2 @@
-==============================================================
 Example files demonstrating the XML::RSS API have been
 installed in ${PREFIX}/share/examples/p5-XML-RSS
-==============================================================
-
diff --git a/www/kronolith/pkg/MESSAGE b/www/kronolith/pkg/MESSAGE
index 3de1c9feb22..82aa06a492b 100644
--- a/www/kronolith/pkg/MESSAGE
+++ b/www/kronolith/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 ${HORDE_NAME} has been installed into ${INSTDIR}/${HORDE_MODULE}
 
 Proceed to complete the installation by reading:
@@ -6,5 +5,3 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
 
 Before installing ${HORDE_NAME}, make sure that Horde is correctly
 configured and working first!
-
-==============================================================
diff --git a/www/mhonarc/pkg/MESSAGE b/www/mhonarc/pkg/MESSAGE
index fa090787da7..84bb9e431f7 100644
--- a/www/mhonarc/pkg/MESSAGE
+++ b/www/mhonarc/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 A complete set of documentation for MHonArc has been installed
 in ${PREFIX}/share/doc/mhonarc
 It contains a FAQ and full instructions on customizing the
@@ -6,4 +5,3 @@ output of the output HTML from your mailbox archives.
 
 Examples and extra programs to use with MHonArc are installed
 under ${PREFIX}/share/examples/mhonarc
-==============================================================
diff --git a/www/mod_auth_bsd/pkg/UNMESSAGE b/www/mod_auth_bsd/pkg/UNMESSAGE
index 9dc30271201..a8914406010 100644
--- a/www/mod_auth_bsd/pkg/UNMESSAGE
+++ b/www/mod_auth_bsd/pkg/UNMESSAGE
@@ -1,12 +1,10 @@
-+---------------
-| To completely deinstall mod_auth_bsd, you should edit
-|
-| /var/www/conf/httpd.conf
-|
-| and remove the line that starts with:
-|
-| LoadModule bsd_auth_module
-|
-| Do not do this if you plan on re-installing the mod_auth_bsd
-| package before the next apache restart.
-+---------------
+To completely deinstall mod_auth_bsd, you should edit
+
+/var/www/conf/httpd.conf
+
+and remove the line that starts with:
+
+LoadModule bsd_auth_module
+
+Do not do this if you plan on re-installing the mod_auth_bsd
+package before the next apache restart.
diff --git a/www/nag/pkg/MESSAGE b/www/nag/pkg/MESSAGE
index 3de1c9feb22..82aa06a492b 100644
--- a/www/nag/pkg/MESSAGE
+++ b/www/nag/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 ${HORDE_NAME} has been installed into ${INSTDIR}/${HORDE_MODULE}
 
 Proceed to complete the installation by reading:
@@ -6,5 +5,3 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
 
 Before installing ${HORDE_NAME}, make sure that Horde is correctly
 configured and working first!
-
-==============================================================
diff --git a/www/phpicalendar/pkg/MESSAGE b/www/phpicalendar/pkg/MESSAGE
index 02de4ae86f1..2ea1d2810b6 100644
--- a/www/phpicalendar/pkg/MESSAGE
+++ b/www/phpicalendar/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 The PHP iCalendar has been installed into
 ${INSTDIR}
 
@@ -11,4 +10,3 @@ ${INSTDIR}/README
 
 You can ensure you have a working install by accessing:
 http://<localhost>/phpicalendar/
-==============================================================
diff --git a/www/phpmyadmin/pkg/MESSAGE b/www/phpmyadmin/pkg/MESSAGE
index 5b4a94d3297..4c726ef1b76 100644
--- a/www/phpmyadmin/pkg/MESSAGE
+++ b/www/phpmyadmin/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 The phpMyAdmin has been installed into ${INSTDIR}
 
 You should point this to the DocumentRoot of your web-server:
@@ -7,5 +6,3 @@ You should point this to the DocumentRoot of your web-server:
 
 You can ensure you have a working install by accessing:
 http://<localhost>/phpMyAdmin/index.php
-
-==============================================================
diff --git a/www/turba/pkg/MESSAGE b/www/turba/pkg/MESSAGE
index b90f8ae4f2c..82aa06a492b 100644
--- a/www/turba/pkg/MESSAGE
+++ b/www/turba/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 ${HORDE_NAME} has been installed into ${INSTDIR}/${HORDE_MODULE}
 
 Proceed to complete the installation by reading:
@@ -6,4 +5,3 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
 
 Before installing ${HORDE_NAME}, make sure that Horde is correctly
 configured and working first!
-==============================================================
diff --git a/www/wordpress/pkg/MESSAGE b/www/wordpress/pkg/MESSAGE
index f241fd3d5c4..401e2d148cb 100644
--- a/www/wordpress/pkg/MESSAGE
+++ b/www/wordpress/pkg/MESSAGE
@@ -1,4 +1,3 @@
-==============================================================
 The WordPress has been installed into
 ${INSTDIR}
 
@@ -11,4 +10,3 @@ ${INSTDIR}/readme.html
 
 You can ensure you have a working install by accessing:
 http://<localhost>/wordpress/
-==============================================================
diff --git a/www/xoops/pkg/MESSAGE b/www/xoops/pkg/MESSAGE
index aca7c2b931b..cadbe30f52a 100644
--- a/www/xoops/pkg/MESSAGE
+++ b/www/xoops/pkg/MESSAGE
@@ -1,8 +1,5 @@
-==============================================================
 The XOOPS has been installed into 
 ${INSTDIR}
 
 Proceed to complete the installation by reading:
 ${INSTDIR}/docs/INSTALL.html
-
-==============================================================