diff --git a/contrib/auth_delay/auth_delay.c b/contrib/auth_delay/auth_delay.c
index 09191bd250e2de8014c81efd4daccca8d0ca3f73..199de9bb39130de2d0ae0862571a464515f107c3 100644
--- a/contrib/auth_delay/auth_delay.c
+++ b/contrib/auth_delay/auth_delay.c
@@ -2,7 +2,7 @@
  *
  * auth_delay.c
  *
- * Copyright (C) 2010, PostgreSQL Global Development Group
+ * Copyright (C) 2010-2011, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		contrib/auth_delay/auth_delay.c
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index f6c3538650deb809938a7f8ffeb4abd7a5b306c7..d5868d66b7d5c311a1298f56b561ed7a3f5b87c7 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL$
+ *	  src/backend/replication/syncrep.c
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index 625e0930662cd0f5d755724f2a9eed564d143ace..540ca5405a087b70daed86fd7b04b6ddeea93e92 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -17,7 +17,7 @@
  *	sync.
  *
  *
- *	Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *	Portions Copyright (c) 2000, Philip Warner
  *
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index 42a70e8f25f5f11159963c1fac1be7eeea234cbf..6decfb13b39370ca725f60a5228af329657a6ae7 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -5,10 +5,11 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL$
+ * IDENTIFICATION
+ *		src/include/catalog/pg_collation.h
  *
  * NOTES
  *	  the genbki.pl script reads this file and generates .bki
diff --git a/src/include/catalog/pg_foreign_table.h b/src/include/catalog/pg_foreign_table.h
index ada807ad712e80dcce56fe1cb0dc87536481a3a7..3ab5344c9dc7c75a82c095bc3ffe8b11f2b4feb3 100644
--- a/src/include/catalog/pg_foreign_table.h
+++ b/src/include/catalog/pg_foreign_table.h
@@ -3,7 +3,7 @@
  * pg_foreign_table.h
  *	  definition of the system "foreign table" relation (pg_foreign_table)
  *
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_foreign_table.h
diff --git a/src/include/replication/basebackup.h b/src/include/replication/basebackup.h
index af6a36621f247942d3915b7f0de358ce493137f8..831c33fb4a9329a04b50227e4ac6060696a2d802 100644
--- a/src/include/replication/basebackup.h
+++ b/src/include/replication/basebackup.h
@@ -3,7 +3,7 @@
  * basebackup.h
  *	  Exports from replication/basebackup.c.
  *
- * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
  *
  * src/include/replication/walsender.h
  *
diff --git a/src/include/replication/syncrep.h b/src/include/replication/syncrep.h
index f4eb3c9f04a2019f3f4b8d354c326b023d417c3b..fb86e9e8d65d0a2e480296a27aee7711d40968b2 100644
--- a/src/include/replication/syncrep.h
+++ b/src/include/replication/syncrep.h
@@ -3,9 +3,10 @@
  * syncrep.h
  *	  Exports from replication/syncrep.c.
  *
- * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
  *
- * $PostgreSQL$
+ * IDENTIFICATION
+ *		src/include/replication/syncrep.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/test/isolation/isolationtester.h b/src/test/isolation/isolationtester.h
index b092ed16a0f1c79a8bb8931241affb35ae139984..1f86db8727d2ce9771998e2a407d7a0c45692f37 100644
--- a/src/test/isolation/isolationtester.h
+++ b/src/test/isolation/isolationtester.h
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * bootstrap.h
- *	  include file for the bootstrapping code
+ * isolationtester.h
+ *	  include file for isolation tests
  *
- *
- * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.44 2006/10/04 00:30:07 momjian Exp $
+ * IDENTIFICATION
+ *		src/test/isolation/isolationtester.h
  *
  *-------------------------------------------------------------------------
  */