diff --git a/astro/Makefile b/astro/Makefile
index ba17dbc242a..d1b85314555 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/02/01 17:00:12 espie Exp $
-# $FreeBSD: Makefile,v 1.4 1997/06/03 09:14:50 asami Exp $
+# $OpenBSD: Makefile,v 1.27 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += celestia
diff --git a/audio/Makefile b/audio/Makefile
index 87d9461e875..4ef32a4a373 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.286 2012/08/17 15:36:02 stsp Exp $
-# $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
+# $OpenBSD: Makefile,v 1.287 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abcde
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 35486674ce2..7a5f0be1ce7 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/07/24 07:55:41 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.4 1997/02/16 13:32:59 andreas Exp $
-#
+# $OpenBSD: Makefile,v 1.18 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += blogbench
diff --git a/biology/Makefile b/biology/Makefile
index cf165b2604b..4a5e3abf599 100644
--- a/biology/Makefile
+++ b/biology/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/02/01 17:00:12 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.8 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += AcePerl
diff --git a/chinese/Makefile b/chinese/Makefile
index 85337255c36..e1df4542dcf 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/07/19 16:51:34 jasper Exp $
-# $FreeBSD: Makefile,v 1.16 1997/11/17 18:36:43 max Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += c2t
diff --git a/comms/Makefile b/comms/Makefile
index 873f58baf45..557b3815d4a 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2012/07/08 18:21:49 lteo Exp $
-# $FreeBSD: Makefile,v 1.27 1997/11/22 14:56:56 peter Exp $
+# $OpenBSD: Makefile,v 1.54 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += amtterm
diff --git a/converters/Makefile b/converters/Makefile
index b057311e4ac..bd04efd7876 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2012/07/07 07:52:50 ajacoutot Exp $
-#
+# $OpenBSD: Makefile,v 1.60 2012/08/18 07:25:25 ajacoutot Exp $
 
     SUBDIR =
     SUBDIR += base64
diff --git a/databases/Makefile b/databases/Makefile
index 2a0a763ba37..d33d8df872d 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.217 2012/08/16 15:21:52 jasper Exp $
-# $FreeBSD: Makefile,v 1.24 1997/10/04 23:32:05 andreas Exp $
-#
+# $OpenBSD: Makefile,v 1.218 2012/08/18 07:25:25 ajacoutot Exp $
+
      SUBDIR =
      SUBDIR += apache-couchdb
      SUBDIR += architect
diff --git a/devel/Makefile b/devel/Makefile
index 0073f8e7e80..1faac7a50e1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.1060 2012/08/12 22:21:27 pascal Exp $
-# $FreeBSD: Makefile,v 1.85 1997/11/20 05:22:14 asami Exp $
+# $OpenBSD: Makefile,v 1.1061 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += ElectricFence
diff --git a/editors/Makefile b/editors/Makefile
index f8800d97e9a..d8d3c9d09bf 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2012/07/14 10:01:14 naddy Exp $
-# $FreeBSD: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp $
-#
+# $OpenBSD: Makefile,v 1.88 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abiword
diff --git a/education/Makefile b/education/Makefile
index e0027955578..9e19500ae57 100644
--- a/education/Makefile
+++ b/education/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2012/03/02 09:36:05 fgsch Exp $
-#
+# $OpenBSD: Makefile,v 1.19 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += algotutor
diff --git a/games/Makefile b/games/Makefile
index 2ddcbe5fadd..84fd5aede55 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.246 2012/08/12 17:21:03 jasper Exp $
-# $FreeBSD: Makefile,v 1.91 1997/11/18 09:29:31 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.247 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += abuse
diff --git a/geo/Makefile b/geo/Makefile
index 4e5f6b7c99c..567fa5e21ed 100644
--- a/geo/Makefile
+++ b/geo/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2012/07/16 14:00:20 jasper Exp $
-# $FreeBSD: Makefile,v 1.4 1997/06/03 09:14:50 asami Exp $
+# $OpenBSD: Makefile,v 1.34 2012/08/18 07:25:25 ajacoutot Exp $
  
      SUBDIR =
      SUBDIR += emerillon
diff --git a/graphics/Makefile b/graphics/Makefile
index e634a15640f..05b85241731 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.331 2012/08/13 08:22:30 jasper Exp $
-# $FreeBSD: Makefile,v 1.55 1997/11/03 12:12:27 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.332 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += DevIL
diff --git a/java/Makefile b/java/Makefile
index d4a905b54c8..4efaed6ec96 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2012/05/23 15:04:30 sthen Exp $
-#
+# $OpenBSD: Makefile,v 1.10 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += asm
diff --git a/lang/Makefile b/lang/Makefile
index b36c7b0a6c2..cb90c7200f5 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.138 2012/06/26 19:54:00 jasper Exp $
-# $FreeBSD: Makefile,v 1.89 1997/11/24 09:24:06 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.139 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += STk
diff --git a/mail/Makefile b/mail/Makefile
index 4ae2b2dd17e..d251cafdec1 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.279 2012/05/30 16:47:35 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.51 1997/11/14 22:56:43 hoek Exp $
-#
+# $OpenBSD: Makefile,v 1.280 2012/08/18 07:25:25 ajacoutot Exp $
  
      SUBDIR =
      SUBDIR += abook
diff --git a/math/Makefile b/math/Makefile
index 8bc8dd634b7..710bd7e77df 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.109 2012/06/07 10:20:34 edd Exp $
-#
+# $OpenBSD: Makefile,v 1.110 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += R
diff --git a/misc/Makefile b/misc/Makefile
index da6be292ed8..33fba185d3c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.153 2012/07/04 07:47:05 sthen Exp $
-# $FreeBSD: Makefile,v 1.121 1997/11/17 10:14:33 tg Exp $
-#
+# $OpenBSD: Makefile,v 1.154 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += WordGenerator
diff --git a/net/Makefile b/net/Makefile
index b0b1f55d879..7f0f1c7b46d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.766 2012/08/05 09:57:23 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
-#
+# $OpenBSD: Makefile,v 1.767 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += BitTorrent
diff --git a/news/Makefile b/news/Makefile
index ea45853f38f..fd9e5ee8d2c 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2012/06/27 08:23:27 mglocker Exp $
-# $FreeBSD: Makefile,v 1.32 1997/11/16 04:58:09 fenner Exp $
-#
+# $OpenBSD: Makefile,v 1.26 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += aub
diff --git a/plan9/Makefile b/plan9/Makefile
index 5849c4bee08..6fb59a4dba2 100644
--- a/plan9/Makefile
+++ b/plan9/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2012/06/26 15:07:53 pascal Exp $
-# $FreeBSD: Makefile,v 1.4 1997/11/17 11:55:01 tg Exp $
+# $OpenBSD: Makefile,v 1.17 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += 9libs
diff --git a/print/Makefile b/print/Makefile
index cc7a6721f18..f0131df6c12 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.99 2012/08/05 09:58:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.100 2012/08/18 07:25:25 ajacoutot Exp $
 
     SUBDIR =
     SUBDIR += a2ps
diff --git a/security/Makefile b/security/Makefile
index dd5a0753a4f..94d2b6998f9 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.294 2012/08/06 13:23:48 dcoppa Exp $
-# $FreeBSD: Makefile,v 1.23 1997/11/09 10:17:02 asami Exp $
-#
+# $OpenBSD: Makefile,v 1.295 2012/08/18 07:25:25 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += ADMfzap
diff --git a/shells/Makefile b/shells/Makefile
index 8f1f54e463c..28a36ccf025 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2012/06/26 22:03:02 pascal Exp $
-# $FreeBSD: Makefile,v 1.13 1997/01/03 00:40:55 max Exp $
-#
+# $OpenBSD: Makefile,v 1.24 2012/08/18 07:25:26 ajacoutot Exp $
 
     SUBDIR =
     SUBDIR += bash
diff --git a/sysutils/Makefile b/sysutils/Makefile
index a42e3aeeece..1dd8e0ceb23 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.265 2012/07/17 19:34:09 landry Exp $
-# $FreeBSD: Makefile,v 1.26 1997/11/20 08:58:51 tg Exp $
+# $OpenBSD: Makefile,v 1.266 2012/08/18 07:25:26 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += LPRng
diff --git a/textproc/Makefile b/textproc/Makefile
index 0fe0e85deb1..815b2bfbe98 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.360 2012/08/11 12:13:36 edd Exp $
-# $FreeBSD: Makefile,v 1.15 1997/11/22 00:31:24 jseger Exp $
+# $OpenBSD: Makefile,v 1.361 2012/08/18 07:25:26 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += TclXML
diff --git a/www/Makefile b/www/Makefile
index 5876c7dbb38..77a5df13e9b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.567 2012/08/04 15:19:53 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp $
+# $OpenBSD: Makefile,v 1.568 2012/08/18 07:25:26 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += ajaxterm
diff --git a/x11/Makefile b/x11/Makefile
index 6ba83b01d97..06549c30fce 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.495 2012/08/12 17:29:13 jasper Exp $
-# $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
+# $OpenBSD: Makefile,v 1.496 2012/08/18 07:25:26 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += Xaw3d