diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index 6a310035b32..64832f562dd 100644
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2008/09/15 22:04:17 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.16 2008/10/28 15:21:48 naddy Exp $
 
 COMMENT=		Music Player Daemon
 DISTNAME=		mpd-0.13.2
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		audio
 HOMEPAGE=		http://www.musicpd.org/
 MAINTAINER=		Tobias Ulmer <tobiasu@tmux.org>
diff --git a/audio/mpd/pkg/MESSAGE b/audio/mpd/pkg/MESSAGE
index 12370b15d30..ef78d1ecc8b 100644
--- a/audio/mpd/pkg/MESSAGE
+++ b/audio/mpd/pkg/MESSAGE
@@ -1,6 +1,6 @@
 A sample configuration file has been installed to ${SYSCONFDIR}/mpd.conf.
 MPD is configured to listen on localhost only. To start MPD at boot time,
-add the following to ${SYSCONFDIR}/rc.local:
+add the following to /etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/mpd ]; then
         echo -n ' mpd';       ${PREFIX}/sbin/mpd
diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index 78423620f2f..0a78cc1eed2 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2008/01/01 21:22:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT=		client for MPD to submit tracks to Last.fm
 CATEGORIES=		audio
 DISTNAME=		scmpc-0.2.2
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 
 HOMEPAGE=		http://scmpc.berlios.de/
 
diff --git a/audio/scmpc/pkg/MESSAGE b/audio/scmpc/pkg/MESSAGE
index 0b19609fd62..d10703a3a97 100644
--- a/audio/scmpc/pkg/MESSAGE
+++ b/audio/scmpc/pkg/MESSAGE
@@ -1,6 +1,6 @@
 A sample configuration file has been installed to
 ${SYSCONFDIR}/scmpc/scmpc.conf. To start scmpc at boot time, add the
-following to ${SYSCONFDIR}/rc.local:
+following to /etc/rc.local:
 
 if [ -x ${PREFIX}/bin/scmpc ]; then
         echo -n ' scmpc';       ${PREFIX}/bin/scmpc
diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
index 1787893822b..3d5b788e5b7 100644
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2008/01/30 14:34:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT=		gateway to send and receive SMS through GSM mobile phones
 
 V=			3.0.9
 DISTNAME=		smstools3-${V}
-PKGNAME=		smstools-${V}p1
+PKGNAME=		smstools-${V}p2
 
 CATEGORIES=		comms
 
diff --git a/comms/smstools/pkg/MESSAGE b/comms/smstools/pkg/MESSAGE
index 3ebb214e2d2..603edf2d0a1 100644
--- a/comms/smstools/pkg/MESSAGE
+++ b/comms/smstools/pkg/MESSAGE
@@ -7,4 +7,4 @@ if [ -x ${PREFIX}/bin/smsd ]; then
 fi
 
 smsd needs access to the serial port; this can be done by adding
-the _smsd user to 'dialer' in ${SYSCONFDIR}/group.
+the _smsd user to 'dialer' in /etc/group.
diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile
index ebf499ac715..22da2bfcc53 100644
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2008/07/02 13:34:46 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.33 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT=	sendmail milter to scan messages for viruses and spam
 
 DISTNAME=	smtp-vilter-1.3.6
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 
 CATEGORIES=    	mail
 
diff --git a/mail/smtp-vilter/pkg/MESSAGE b/mail/smtp-vilter/pkg/MESSAGE
index 4d05b974816..6dddb74da5e 100755
--- a/mail/smtp-vilter/pkg/MESSAGE
+++ b/mail/smtp-vilter/pkg/MESSAGE
@@ -3,10 +3,10 @@ See smtp-vilter(8) for instructions on how to register the milter.
 
 To start the milter automatically on startup, one can use:
 
-${SYSCONFDIR}/rc.conf.local:
+/etc/rc.conf.local:
 smtp_vilter_flags=""	# for normal use ""
 
-${SYSCONFDIR}/rc.local:
+/etc/rc.local:
 if [ X"${smtp_vilter_flags}" != X"NO" -a \
     -x ${PREFIX}/sbin/smtp-vilter ]; then
 	echo -n ' smtp-vilter'
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 880da96158e..a1ffe0a0afd 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2008/10/07 21:02:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT-main=		modern authoritative nameserver
 COMMENT-mysql=		mysql database access emodule for powerdns
@@ -9,7 +9,7 @@ COMMENT-sqlite3=	sqlite3 database access module for powerdns
 V=			2.9.21.1
 DISTNAME=		pdns-${V}
 PKGNAME=		powerdns-${V}
-PKGNAME-main=		powerdns-${V}p0
+PKGNAME-main=		powerdns-${V}p1
 PKGNAME-mysql=		powerdns-mysql-${V}
 PKGNAME-pgsql=		powerdns-pgsql-${V}
 PKGNAME-sqlite= 	powerdns-sqlite-${V}
diff --git a/net/powerdns/pkg/MESSAGE-main b/net/powerdns/pkg/MESSAGE-main
index 7f750f77564..eeec805e05f 100644
--- a/net/powerdns/pkg/MESSAGE-main
+++ b/net/powerdns/pkg/MESSAGE-main
@@ -1,5 +1,5 @@
 To start the powerdns server at boot time, add the following to
-${SYSCONFDIR}/rc.local:
+/etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/pdns_server ]; then
         echo -n ' pdns_server';       ${PREFIX}/sbin/pdns_server \
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ebe4e0b0bb9..2ed0bc40705 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.33 2008/10/28 12:33:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT=		Common Unix Printing System
 
 VERSION=		1.2.7
 DISTNAME=		cups-${VERSION}-source
-PKGNAME=		cups-${VERSION}p10
+PKGNAME=		cups-${VERSION}p11
 CATEGORIES=		print sysutils
 SHARED_LIBS=		cups		3.0 \
 			cupsimage	2.3
diff --git a/print/cups/pkg/MESSAGE b/print/cups/pkg/MESSAGE
index 0689434a150..37be8cde3e1 100644
--- a/print/cups/pkg/MESSAGE
+++ b/print/cups/pkg/MESSAGE
@@ -2,7 +2,7 @@ To enable CUPS, execute '${PREFIX}/sbin/cups-enable' as root.
 To disable CUPS, execute '${PREFIX}/sbin/cups-disable' as root.
 
 To start cups at boot time, add the following to
-${SYSCONFDIR}/rc.local:
+/etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/cupsd ]; then
         echo -n ' cupsd';       ${PREFIX}/sbin/cupsd
diff --git a/sysutils/tabled/Makefile b/sysutils/tabled/Makefile
index 37554955e77..9d04fc9f0c1 100644
--- a/sysutils/tabled/Makefile
+++ b/sysutils/tabled/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:37 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2008/10/28 15:21:49 naddy Exp $
 
 COMMENT=	daemon to modify pf tables from userland
 
 DISTNAME=	tabled-1.0.5
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=    	sysutils
 
diff --git a/sysutils/tabled/pkg/MESSAGE b/sysutils/tabled/pkg/MESSAGE
index da77d6b9120..76fc64dbee1 100644
--- a/sysutils/tabled/pkg/MESSAGE
+++ b/sysutils/tabled/pkg/MESSAGE
@@ -4,7 +4,7 @@ in this version of tabled before the daemon is started:
 	# mkfifo /var/run/tabled.sock
 
 To automatically start tabled at system startup time, you can add the following
-commands to ${SYSCONFDIR}/rc.local:
+commands to /etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/tabled ]; then
 	echo -n ' tabled'
diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index 45cc3c761dd..d63fa02bea8 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.45 2008/10/07 09:57:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2008/10/28 15:21:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
 V=			1.4.22
 DISTNAME=		asterisk-$V
-FULLPKGNAME-main=	asterisk-$V
+FULLPKGNAME-main=	asterisk-$Vp0
 
 CATEGORIES=		telephony
 
diff --git a/telephony/asterisk/pkg/MESSAGE-main b/telephony/asterisk/pkg/MESSAGE-main
index d432a59d973..4d38d57e84f 100644
--- a/telephony/asterisk/pkg/MESSAGE-main
+++ b/telephony/asterisk/pkg/MESSAGE-main
@@ -10,7 +10,7 @@ Simplified sample configuration is provided in ${SYSCONFDIR}/asterisk;
 the full set is available in ${PREFIX}/share/examples/asterisk/default.
 
 To have Asterisk start at boot time, you may insert the following
-into ${SYSCONFDIR}/rc.local:
+into /etc/rc.local:
 
 if [ -x ${PREFIX}/sbin/safe_asterisk ]; then
         echo -n ' asterisk';   ${PREFIX}/sbin/safe_asterisk