diff --git a/palm/bibelot/Makefile b/palm/bibelot/Makefile
index f29d4429ccf..09de493df96 100644
--- a/palm/bibelot/Makefile
+++ b/palm/bibelot/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2004/02/02 17:35:02 sturm Exp $
+# $OpenBSD: Makefile,v 1.6 2007/09/15 19:00:54 steven Exp $
 
-COMMENT=	"format/convert text documents into compressed .pdb files"
+COMMENT=	format/convert text documents into compressed .pdb files
 
 VERSION=	0.9.4
 PROG=		bibelot
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index e216291080c..5560dd5b4c1 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2006/12/23 21:21:04 sturm Exp $
+# $OpenBSD: Makefile,v 1.7 2007/09/15 19:00:54 steven Exp $
 
-COMMENT=		"tool for synchronizing PalmOS devices"
+COMMENT=		tool for synchronizing PalmOS devices
 
 DISTNAME=		coldsync-3.0-pre4
 PKGNAME=		coldsync-3.0pre4p2
diff --git a/palm/isilo/Makefile b/palm/isilo/Makefile
index 896b444c4c2..fb5ac689713 100644
--- a/palm/isilo/Makefile
+++ b/palm/isilo/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2002/12/29 20:31:39 fgsch Exp $
+# $OpenBSD: Makefile,v 1.4 2007/09/15 19:00:54 steven Exp $
 
 ONLY_FOR_ARCHS=	i386
 
-COMMENT=	"converts documents from text/html to isilo format"
+COMMENT=	converts documents from text/html to isilo format
 
 VER=		2.58
 DISTNAME=	iSiloBSD
diff --git a/palm/p5-Palm/Makefile b/palm/p5-Palm/Makefile
index f6bb6e711ad..5d92ec4e1b0 100644
--- a/palm/p5-Palm/Makefile
+++ b/palm/p5-Palm/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2007/01/14 20:35:36 simon Exp $
+# $OpenBSD: Makefile,v 1.6 2007/09/15 19:00:54 steven Exp $
 
-COMMENT=	"interface to palm pdb databases"
+COMMENT=	interface to palm pdb databases
 
 MODULES=	cpan
 DISTNAME=	p5-Palm-1.3.0
diff --git a/palm/palm-bookmarks/Makefile b/palm/palm-bookmarks/Makefile
index 3d552ae63dc..58073a3f1c4 100644
--- a/palm/palm-bookmarks/Makefile
+++ b/palm/palm-bookmarks/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2006/02/05 09:54:47 steven Exp $
+# $OpenBSD: Makefile,v 1.6 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"bookmarks on your palm"
+COMMENT=	bookmarks on your palm
 
 DISTNAME=	palm-bookmarks-0.2
 PKGNAME=	${DISTNAME}p0
diff --git a/palm/palmpower/Makefile b/palm/palmpower/Makefile
index ab9b6508f93..43a7bd8e7fd 100644
--- a/palm/palmpower/Makefile
+++ b/palm/palmpower/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/02 19:05:47 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"disassembler and other tools for palmos binaries"
+COMMENT=	disassembler and other tools for palmos binaries
 
 VERSION=	1.0.2
 DISTNAME=	palmpower-${VERSION}
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index 8cdf87be25b..3eff997b7dd 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2006/08/03 23:28:11 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"generate resources for PalmOS applications from text descr"
+COMMENT=	generate resources for PalmOS applications from text descr
 
 DISTNAME=	pilrc-2.8p5
 PKGNAME=	${DISTNAME:S/p5/.5/}
diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index 86c6e0698fd..df45e69c7f5 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2007/04/01 17:50:25 martynas Exp $
+# $OpenBSD: Makefile,v 1.4 2007/09/15 19:00:55 steven Exp $
 
 ONLY_FOR_ARCHS=		i386
-COMMENT=		"Palm OS Emulator"
+COMMENT=		Palm OS Emulator
 
 VERSION=		3.5
 DISTNAME=		Emulator_Src_${VERSION}
diff --git a/plan9/9libs/Makefile b/plan9/9libs/Makefile
index ba26010333a..f162450869d 100644
--- a/plan9/9libs/Makefile
+++ b/plan9/9libs/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2006/12/16 19:34:14 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.9 2007/09/15 19:00:55 steven Exp $
 
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc" && \
     ${MACHINE_ARCH} != "sparc64"
-BROKEN=			"varargs misuse, and unportable software"
+BROKEN=			varargs misuse, and unportable software
 .endif
 
-COMMENT=		"Plan 9 compatibility libraries"
+COMMENT=		Plan 9 compatibility libraries
 
 DISTNAME=		9libs-1.0
 PKGNAME=		${DISTNAME}p3
diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile
index b5167e509e5..37044a054e5 100644
--- a/plan9/9menu/Makefile
+++ b/plan9/9menu/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.20 2004/12/20 13:45:21 alek Exp $
+# $OpenBSD: Makefile,v 1.21 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"simple menu patterned after plan9"
+COMMENT=	simple menu patterned after plan9
 
 DISTNAME=	9menu-1.7
 CATEGORIES=	plan9
diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
index 5baf41102c3..04f995150f0 100644
--- a/plan9/9wm/Makefile
+++ b/plan9/9wm/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.22 2006/11/13 12:51:15 steven Exp $
+# $OpenBSD: Makefile,v 1.23 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"8 1/2-like Window Manager for X11"
+COMMENT=	8 1/2-like Window Manager for X11
 
 PKGNAME=	9wm-1.2pre
 DISTNAME=	pre-9wm-1.2
diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 225e54225ae..a04e442e4e8 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.14 2004/12/20 13:45:22 alek Exp $
+# $OpenBSD: Makefile,v 1.15 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"shell (clone of plan9 shell)"
+COMMENT=	shell (clone of plan9 shell)
 
 DISTNAME=	rc-1.6
 CATEGORIES=	plan9 shells
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index b2d3b80aae4..70286c7fc3f 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.21 2004/12/20 13:45:22 alek Exp $
+# $OpenBSD: Makefile,v 1.22 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"X11 version of Rob Pike's editor, sam"
+COMMENT=	X11 version of Rob Pike's editor, sam
 
 DISTNAME=	sam
 PKGNAME=	sam-4.3.19980506
diff --git a/plan9/tcs/Makefile b/plan9/tcs/Makefile
index 5bcbb195e99..2045c5c0058 100644
--- a/plan9/tcs/Makefile
+++ b/plan9/tcs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.20 2004/12/20 13:45:22 alek Exp $
+# $OpenBSD: Makefile,v 1.21 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"translate character sets"
+COMMENT=	translate character sets
 
 DISTNAME=	tcs
 PKGNAME=	tcs-19950325
diff --git a/plan9/w9wm/Makefile b/plan9/w9wm/Makefile
index 80d42cfc620..276a117638f 100644
--- a/plan9/w9wm/Makefile
+++ b/plan9/w9wm/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.12 2006/11/13 12:51:15 steven Exp $
+# $OpenBSD: Makefile,v 1.13 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"hacked 9wm, with support for virtual screens"
+COMMENT=	hacked 9wm, with support for virtual screens
 
 DISTNAME=	w9wm-0.4.2
 CATEGORIES=	plan9
diff --git a/plan9/wily/Makefile b/plan9/wily/Makefile
index 36e2c4bbaf7..418853682be 100644
--- a/plan9/wily/Makefile
+++ b/plan9/wily/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.19 2006/09/18 11:59:59 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2007/09/15 19:00:55 steven Exp $
 
-COMMENT=	"clone of the Plan9 editor 'acme'"
+COMMENT=	clone of the Plan9 editor 'acme'
 
 VERSION=	0.13.41
 DISTNAME=	wily-9libs