diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 2c16463..79b9060 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c
index 145a1d2..f194041 100644
--- a/contrib/btree_gist/btree_bytea.c
+++ b/contrib/btree_gist/btree_bytea.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index da88878..0c34969 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index bbfded1..b8b36b1 100644
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index f58c9b6..7c6c933 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index abc2879..7da98f6 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index 0c47de6..bcd8e92 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 
diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h
index 17a6839..a6e291d 100644
--- a/contrib/btree_gist/btree_gist.h
+++ b/contrib/btree_gist/btree_gist.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef __BTREE_GIST_H__
 #define __BTREE_GIST_H__
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 396c213..638f061 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index 5a6fcaf..2d020fa 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 58cc225..4da5434 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index c37940e..288805d 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 5cad10f..f80e130 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index d3da94b..525bcf0 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index 7132a11..041060c 100644
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c
index 4966dd3..a9b0265 100644
--- a/contrib/btree_gist/btree_text.c
+++ b/contrib/btree_gist/btree_text.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_var.h"
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index 68bef53..efd5724 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 04d9e18..9f5ff6b 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index dfa92e3..e645999 100644
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 9fc1bcc..a4e2a0b 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef __BTREE_UTILS_VAR_H__
 #define __BTREE_UTILS_VAR_H__
diff --git a/contrib/hstore/crc32.c b/contrib/hstore/crc32.c
index 1c031fd..4720748 100644
--- a/contrib/hstore/crc32.c
+++ b/contrib/hstore/crc32.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Both POSIX and CRC32 checksums */
 
diff --git a/contrib/hstore/crc32.h b/contrib/hstore/crc32.h
index d8c5325..03888ee 100644
--- a/contrib/hstore/crc32.h
+++ b/contrib/hstore/crc32.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef _CRC32_H
 #define _CRC32_H
diff --git a/contrib/intarray/_int.h b/contrib/intarray/_int.h
index e84bf03..8084630 100644
--- a/contrib/intarray/_int.h
+++ b/contrib/intarray/_int.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef ___INT_H__
 #define ___INT_H__
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 092709a..e968208 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index 91a49a3..40cf090 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index dd9c74a..cf76c9f 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index 9351028..52e321d 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 3d42cdc..95980d4 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 6ebc3b5..0f82bdf 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * GiST support for ltree[]
diff --git a/contrib/ltree/_ltree_op.c b/contrib/ltree/_ltree_op.c
index 316f20b..9622532 100644
--- a/contrib/ltree/_ltree_op.c
+++ b/contrib/ltree/_ltree_op.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * op function for ltree[]
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index 80f32c2..4d0c0ce 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -38,7 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/secure/lib/libcrypt/crypt-des.c,v 1.12 1999/09/20 12:39:20 markm Exp $
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index a3a77b3..e582f1f 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -1,7 +1,7 @@
 /*
  * File imported from FreeBSD, original by Poul-Henning Kamp.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.5 1999/12/17 20:21:45 peter Exp $
  *
  * $PostgreSQL$
  */
diff --git a/contrib/pgcrypto/md5.c b/contrib/pgcrypto/md5.c
index f69cd05..c293c35 100644
--- a/contrib/pgcrypto/md5.c
+++ b/contrib/pgcrypto/md5.c
@@ -1,4 +1,4 @@
-/*	   $KAME$	   */
+/*	   $KAME: md5.c,v 1.3 2000/02/22 14:01:17 itojun Exp $	   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h
index 3be106e..eb803f5 100644
--- a/contrib/pgcrypto/md5.h
+++ b/contrib/pgcrypto/md5.h
@@ -1,5 +1,5 @@
 /*	$PostgreSQL$ */
-/*	   $KAME$	   */
+/*	   $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $	   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c
index a0a7d10..8a7840d 100644
--- a/contrib/pgcrypto/rijndael.c
+++ b/contrib/pgcrypto/rijndael.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD$ */
+/*	$OpenBSD: rijndael.c,v 1.6 2000/12/09 18:51:34 markus Exp $ */
 
 /* $PostgreSQL$ */
 
diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h
index 47fd2f4..afa92f3 100644
--- a/contrib/pgcrypto/rijndael.h
+++ b/contrib/pgcrypto/rijndael.h
@@ -1,7 +1,7 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
- *	$OpenBSD$ */
+ *	$OpenBSD: rijndael.h,v 1.3 2001/05/09 23:01:32 markus Exp $ */
 
 /* This is an independent implementation of the encryption algorithm:	*/
 /*																		*/
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index a33e463..e887849 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -1,4 +1,4 @@
-/*	   $KAME$    */
+/*	   $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h
index 1a1d664..a08b294 100644
--- a/contrib/pgcrypto/sha1.h
+++ b/contrib/pgcrypto/sha1.h
@@ -1,5 +1,5 @@
 /*	$PostgreSQL$ */
-/*	   $KAME$    */
+/*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c
index 33bba44..c11aa06 100644
--- a/contrib/pgcrypto/sha2.c
+++ b/contrib/pgcrypto/sha2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD$	*/
+/*	$OpenBSD: sha2.c,v 1.6 2004/05/03 02:57:36 millert Exp $	*/
 
 /*
  * FILE:	sha2.c
diff --git a/contrib/pgcrypto/sha2.h b/contrib/pgcrypto/sha2.h
index c601fdd..a159584 100644
--- a/contrib/pgcrypto/sha2.h
+++ b/contrib/pgcrypto/sha2.h
@@ -1,5 +1,5 @@
 /*	$PostgreSQL$ */
-/*	$OpenBSD$	*/
+/*	$OpenBSD: sha2.h,v 1.2 2004/04/28 23:11:57 millert Exp $	*/
 
 /*
  * FILE:	sha2.h
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index abfa8c4..aceb501 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  ******************************************************************************
   This file contains routines that can be bound to a Postgres backend and
diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h
index cd02a60..585d6c6 100644
--- a/contrib/seg/segdata.h
+++ b/contrib/seg/segdata.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 typedef struct SEG
 {
diff --git a/src/backend/optimizer/plan/README b/src/backend/optimizer/plan/README
index 2ef6953..08ae98f 100644
--- a/src/backend/optimizer/plan/README
+++ b/src/backend/optimizer/plan/README
@@ -10,7 +10,7 @@ From owner-pgsql-hackers@hub.org Fri Feb 13 09:01:19 1998
 Received: from renoir.op.net (root@renoir.op.net [209.152.193.4])
 	by candle.pha.pa.us (8.8.5/8.8.5) with ESMTP id JAA11576
 	for <maillist@candle.pha.pa.us>; Fri, 13 Feb 1998 09:01:17 -0500 (EST)
-Received: from hub.org (hub.org [209.47.148.200]) by renoir.op.net (o1/$Revision: 1.2 $) with ESMTP id IAA09761 for <maillist@candle.pha.pa.us>; Fri, 13 Feb 1998 08:41:22 -0500 (EST)
+Received: from hub.org (hub.org [209.47.148.200]) by renoir.op.net (o1/$Revision$) with ESMTP id IAA09761 for <maillist@candle.pha.pa.us>; Fri, 13 Feb 1998 08:41:22 -0500 (EST)
 Received: from localhost (majordom@localhost) by hub.org (8.8.8/8.7.5) with SMTP id IAA08135; Fri, 13 Feb 1998 08:40:17 -0500 (EST)
 Received: by hub.org (TLB v0.10a (1.23 tibbs 1997/01/09 00:29:32)); Fri, 13 Feb 1998 08:38:42 -0500 (EST)
 Received: (from majordom@localhost) by hub.org (8.8.8/8.7.5) id IAA06646 for pgsql-hackers-outgoing; Fri, 13 Feb 1998 08:38:35 -0500 (EST)
diff --git a/src/backend/port/darwin/system.c b/src/backend/port/darwin/system.c
index 4c9f9dd..0dfd6a6 100644
--- a/src/backend/port/darwin/system.c
+++ b/src/backend/port/darwin/system.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * only needed in OS X 10.1 and possibly early 10.2 releases */
 #include <AvailabilityMacros.h>
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/system.c,v 1.6 2000/03/16 02:14:41 jasone Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/src/backend/port/dynloader/sco.c b/src/backend/port/dynloader/sco.c
index 2c6fd99..cd0e6bf 100644
--- a/src/backend/port/dynloader/sco.c
+++ b/src/backend/port/dynloader/sco.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/solaris.c b/src/backend/port/dynloader/solaris.c
index 905d456..66e5468 100644
--- a/src/backend/port/dynloader/solaris.c
+++ b/src/backend/port/dynloader/solaris.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/sunos4.c b/src/backend/port/dynloader/sunos4.c
index 3f17a6c..272bef0 100644
--- a/src/backend/port/dynloader/sunos4.c
+++ b/src/backend/port/dynloader/sunos4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/svr4.c b/src/backend/port/dynloader/svr4.c
index c989012..a1b99c6 100644
--- a/src/backend/port/dynloader/svr4.c
+++ b/src/backend/port/dynloader/svr4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/univel.c b/src/backend/port/dynloader/univel.c
index 25196d3..61ce3b9 100644
--- a/src/backend/port/dynloader/univel.c
+++ b/src/backend/port/dynloader/univel.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/unixware.c b/src/backend/port/dynloader/unixware.c
index 36679a8..47ec794 100644
--- a/src/backend/port/dynloader/unixware.c
+++ b/src/backend/port/dynloader/unixware.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * Dummy file used for nothing at this point
  *
diff --git a/src/backend/port/dynloader/win32.h b/src/backend/port/dynloader/win32.h
index 437764e..2816565 100644
--- a/src/backend/port/dynloader/win32.h
+++ b/src/backend/port/dynloader/win32.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef PORT_PROTOS_H
 #define PORT_PROTOS_H
diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c
index 3c1c8f6..0a929ae 100644
--- a/src/backend/port/nextstep/port.c
+++ b/src/backend/port/nextstep/port.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #include "postgres.h"
 
diff --git a/src/backend/utils/mb/wstrcmp.c b/src/backend/utils/mb/wstrcmp.c
index 626520a..5d45dee 100644
--- a/src/backend/utils/mb/wstrcmp.c
+++ b/src/backend/utils/mb/wstrcmp.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *-
  * Copyright (c) 1990, 1993
diff --git a/src/backend/utils/mb/wstrncmp.c b/src/backend/utils/mb/wstrncmp.c
index 68eb9df..4e9575f 100644
--- a/src/backend/utils/mb/wstrncmp.c
+++ b/src/backend/utils/mb/wstrncmp.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * Copyright (c) 1989, 1993
diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h
index 6e79da4..37cbf74 100644
--- a/src/include/commands/proclang.h
+++ b/src/include/commands/proclang.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *-------------------------------------------------------------------------
  *
diff --git a/src/include/port/aix.h b/src/include/port/aix.h
index 581b9e0..20cc8c9 100644
--- a/src/include/port/aix.h
+++ b/src/include/port/aix.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #define CLASS_CONFLICT
 #define DISABLE_XOPEN_NLS
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index c28d87d..800742e 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -1,4 +1,4 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index 050264c..7faec96 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
diff --git a/src/include/port/ultrix4.h b/src/include/port/ultrix4.h
index a45ad01..5c48098 100644
--- a/src/include/port/ultrix4.h
+++ b/src/include/port/ultrix4.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #define NOFIXADE
 #define NEED_STRDUP
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index 4a002e4..28e5677 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  ***************************************
  * Define this if you are compiling with
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index 35688a8..3cd1f27 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  * see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
diff --git a/src/include/port/win32/pwd.h b/src/include/port/win32/pwd.h
index c28d87d..800742e 100644
--- a/src/include/port/win32/pwd.h
+++ b/src/include/port/win32/pwd.h
@@ -1,4 +1,4 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 
diff --git a/src/include/port/win32/sys/wait.h b/src/include/port/win32/sys/wait.h
index c28d87d..800742e 100644
--- a/src/include/port/win32/sys/wait.h
+++ b/src/include/port/win32/sys/wait.h
@@ -1,4 +1,4 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 
diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h
index 1637811..38d59f4 100644
--- a/src/include/utils/cash.h
+++ b/src/include/utils/cash.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * cash.h
diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h
index c28d87d..800742e 100644
--- a/src/interfaces/ecpg/include/sqlda.h
+++ b/src/interfaces/ecpg/include/sqlda.h
@@ -1,4 +1,4 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 
diff --git a/src/interfaces/ecpg/include/sqltypes.h b/src/interfaces/ecpg/include/sqltypes.h
index fcf3cbe..b5cb258 100644
--- a/src/interfaces/ecpg/include/sqltypes.h
+++ b/src/interfaces/ecpg/include/sqltypes.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef ECPG_SQLTYPES_H
 #define ECPG_SQLTYPES_H
diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h
index 33008c8..232ea1d 100644
--- a/src/interfaces/libpq/win32.h
+++ b/src/interfaces/libpq/win32.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 #ifndef __win32_h_included
 #define __win32_h_included
diff --git a/src/pl/plperl/spi_internal.c b/src/pl/plperl/spi_internal.c
index faf8795..a9ccbd9 100644
--- a/src/pl/plperl/spi_internal.c
+++ b/src/pl/plperl/spi_internal.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * This kludge is necessary because of the conflicting
diff --git a/src/port/crypt.c b/src/port/crypt.c
index 67edc97..6a11808 100644
--- a/src/port/crypt.c
+++ b/src/port/crypt.c
@@ -1,5 +1,5 @@
 /* $PostgreSQL$ */
-/*	$NetBSD$	*/
+/*	$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)crypt.c	8.1.1.1 (Berkeley) 8/18/93";
 #else
-__RCSID("$NetBSD$");
+__RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
 #endif
 #endif   /* not lint */
 
diff --git a/src/port/qsort.c b/src/port/qsort.c
index 7d50fb8..9fa007d 100644
--- a/src/port/qsort.c
+++ b/src/port/qsort.c
@@ -12,7 +12,7 @@
  *	$PostgreSQL$
  */
 
-/*	$NetBSD$	*/
+/*	$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
diff --git a/src/port/qsort_arg.c b/src/port/qsort_arg.c
index 586f2f6..138bcea 100644
--- a/src/port/qsort_arg.c
+++ b/src/port/qsort_arg.c
@@ -12,7 +12,7 @@
  *	$PostgreSQL$
  */
 
-/*	$NetBSD$	*/
+/*	$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
diff --git a/src/port/rand.c b/src/port/rand.c
index e72b2bd..cc553f6 100644
--- a/src/port/rand.c
+++ b/src/port/rand.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *-------------------------------------------------------------------------
  *
diff --git a/src/port/strlcat.c b/src/port/strlcat.c
index 2ad7637..4e83048 100644
--- a/src/port/strlcat.c
+++ b/src/port/strlcat.c
@@ -1,7 +1,7 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
- *	$OpenBSD$	*/
+ *	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/src/port/strlcpy.c b/src/port/strlcpy.c
index 8629a08..03be6c7 100644
--- a/src/port/strlcpy.c
+++ b/src/port/strlcpy.c
@@ -14,7 +14,7 @@
  *-------------------------------------------------------------------------
  */
 
-/*	$OpenBSD$	*/
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/src/port/strtoul.c b/src/port/strtoul.c
index 04946a0..234f066 100644
--- a/src/port/strtoul.c
+++ b/src/port/strtoul.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * Copyright (c) 1990, 1993
diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 1e506d2..d23f4e2 100644
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * testlibpq.c
diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 1c8689d..35c72e5 100644
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * testlibpq2.c
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index 9c773d2..489a9b1 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * testlibpq3.c
diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index 4b79d1d..180842e 100644
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  *
  * testlibpq4.c
diff --git a/src/test/locale/test-ctype.c b/src/test/locale/test-ctype.c
index 7ee6d01..876ea25 100644
--- a/src/test/locale/test-ctype.c
+++ b/src/test/locale/test-ctype.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  */
 
 /*
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index a189039..977b6c2 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL:$ 
+ * $PostgreSQL$ 
  *
  ******************************************************************************
   This file contains routines that can be bound to a Postgres backend and