diff --git a/.autom4te.cfg b/.autom4te.cfg
index e998198ade..a054d32ba4 100644
--- a/.autom4te.cfg
+++ b/.autom4te.cfg
@@ -1,3 +1,15 @@
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
 ## ------------------ ##
 ## User Preferences.  ##
 ## ------------------ ##
diff --git a/.h5chkright.ini b/.h5chkright.ini
index 7a66adcab7..e93b92a965 100644
--- a/.h5chkright.ini
+++ b/.h5chkright.ini
@@ -1,3 +1,15 @@
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
 # Initialization files for the Copyright Checker, chkcopyright.
 # Each line is a keyword for action and the rest are values.
 # Keywords:
@@ -19,6 +31,12 @@ skip ltmain.sh
 skip missing
 skip mkinstalldirs
 
+# Generated files in top-level
+skip configure
+
+# Generated files in src.
+skip H5config.h.in
+
 # Generated files in fortran/src.
 skip H5match_types.c
 skip H5test_kind.f90
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index 6afa3272cd..9d5a27226a 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -1,7 +1,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
- *		                                                             *
+ *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 057fe69a79..d42e31b94b 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -1,3 +1,15 @@
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
 # Doxyfile 1.4.2
 
 #---------------------------------------------------------------------------
diff --git a/c++/src/header.html b/c++/src/header.html
index 12e4c1f61a..db1c87c1f3 100644
--- a/c++/src/header.html
+++ b/c++/src/header.html
@@ -4,6 +4,22 @@ xmlns:o="urn:schemas-microsoft-com:office:office"
 xmlns:w="urn:schemas-microsoft-com:office:word"
 xmlns="http://www.w3.org/TR/REC-html40">
 
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <head>
 <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
 <meta name=ProgId content=Word.Document>
diff --git a/release_docs/INSTALL_Windows.html b/release_docs/INSTALL_Windows.html
index 9ff354532b..cb1100055e 100755
--- a/release_docs/INSTALL_Windows.html
+++ b/release_docs/INSTALL_Windows.html
@@ -1,5 +1,21 @@
 <html>
 
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <head>
 <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
 <meta name="ProgId" content="FrontPage.Editor.Document">
@@ -2558,4 +2574,4 @@ lines. </p>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/release_docs/INSTALL_Windows_From_Command_Line.html b/release_docs/INSTALL_Windows_From_Command_Line.html
index aea6b4e8fa..2447eb3263 100755
--- a/release_docs/INSTALL_Windows_From_Command_Line.html
+++ b/release_docs/INSTALL_Windows_From_Command_Line.html
@@ -1,4 +1,21 @@
 <HTML>
+
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <HEAD>
 <META NAME="GENERATOR" Content="Microsoft FrontPage 5.0">
 <TITLE>Instructions for Building and Testing HDF5 from Command Line on Windows XP</TITLE>
@@ -733,4 +750,4 @@ list-style-type:none;
 <p>&nbsp;</p>
                     </ul>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/release_docs/INSTALL_Windows_Short_Intel.htm b/release_docs/INSTALL_Windows_Short_Intel.htm
index c54dadde92..671398a636 100755
--- a/release_docs/INSTALL_Windows_Short_Intel.htm
+++ b/release_docs/INSTALL_Windows_Short_Intel.htm
@@ -1,4 +1,21 @@
 <HTML>
+
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <HEAD>
 <META NAME="GENERATOR" Content="Microsoft FrontPage 5.0">
 <TITLE>HDF5 Build and Install Instructions for Windows XP with 
@@ -436,4 +453,4 @@ all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.</p>
 <p>&nbsp;</p>
 
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/release_docs/INSTALL_Windows_Short_MSVS6.0.htm b/release_docs/INSTALL_Windows_Short_MSVS6.0.htm
index b91f637fc5..345edfc4f1 100755
--- a/release_docs/INSTALL_Windows_Short_MSVS6.0.htm
+++ b/release_docs/INSTALL_Windows_Short_MSVS6.0.htm
@@ -1,4 +1,21 @@
 <HTML>
+
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <HEAD>
 <META NAME="GENERATOR" Content="Microsoft FrontPage 5.0">
 <TITLE>HDF5 Build and Install Instructions for Windows XP with MSVS 6.0</TITLE>
@@ -288,4 +305,4 @@ all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.</p>
 
 
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/release_docs/INSTALL_Windows_Short_Net.htm b/release_docs/INSTALL_Windows_Short_Net.htm
index 5ce5f2baae..2f95d48d02 100755
--- a/release_docs/INSTALL_Windows_Short_Net.htm
+++ b/release_docs/INSTALL_Windows_Short_Net.htm
@@ -1,4 +1,21 @@
 <HTML>
+
+<!--
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+  * Copyright by the Board of Trustees of the University of Illinois.         *
+  * All rights reserved.                                                      *
+  *                                                                           *
+  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+  * terms governing use, modification, and redistribution, is contained in    *
+  * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+  * of the source code distribution tree; Copyright.html can be found at the  *
+  * root level of an installed copy of the electronic HDF5 document set and   *
+  * is linked from the top-level documents page.  It can also be found at     *
+  * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ -->
+
 <HEAD>
 <META NAME="GENERATOR" Content="Microsoft FrontPage 5.0">
 <TITLE>HDF5 Build and Install Instructions for Windows XP with MSVS .NET 2003</TITLE>
@@ -331,4 +348,4 @@ all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory.</p>
 
 
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h
index 728b022c0f..7cdf7cdd62 100644
--- a/tools/h5diff/h5diff_common.h
+++ b/tools/h5diff/h5diff_common.h
@@ -1,3 +1,17 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 extern unsigned char g_Parallel;
 extern int g_nTasks;
 
diff --git a/tools/misc/h5stat.c b/tools/misc/h5stat.c
index e626c8ef84..b290a99c65 100644
--- a/tools/misc/h5stat.c
+++ b/tools/misc/h5stat.c
@@ -1,3 +1,17 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>