diff --git a/Makefile b/Makefile
index 08c9d8ca..93d5d98e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
 # ***************************************************** -*- Makefile -*-
 #
-# AUTHOR(S): Andreas Huggel (ahu)
-#
-# RCS information
-#  $Name:  $
-#  $Revision: 1.6 $
+# File:      Makefile
+# Version:   $Rev$
+# Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
+# History:   15-Jan-04, ahu: created
 #
 # Description:
 #  This makefile mainly forwards to makefiles in subdirectories.
diff --git a/config.mk.in b/config.mk.in
index 7c58d5e7..12449d65 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 #
 # File:      config.mk.in
-# Version:   $Name:  $ $Revision: 1.2 $
+# Version:   $Rev$
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
diff --git a/doc/Makefile b/doc/Makefile
index a012f998..9e9b0bd8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 #
 # File:      Makefile
-# Version:   $Name:  $ $Revision: 1.2 $
+# Version:   $Rev$
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
diff --git a/doc/exiv2.dot b/doc/exiv2.dot
index 6ba98d53..dd174ccb 100644
--- a/doc/exiv2.dot
+++ b/doc/exiv2.dot
@@ -1,12 +1,13 @@
 ################################################################################
-# File    exiv2.dot
-# Brief   Dot file for a graph showing the component dependencies 
-#         of the Exiv2 library. Run the following command to get the image:
-#         $ dot -Tgif -oexiv2.gif exiv2.dot
-# Version $Name:  $ $Revision: 1.5 $
-# Author  Andreas Huggel (ahu)
-#         <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-# Date    18-Feb-04, ahu: created
+# File     : exiv2.dot
+# Version  : $Rev$
+# Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
+# History  : 18-Feb-04, ahu: created
+#
+# Description:
+#  Dot file for a graph showing the component dependencies of the
+#  Exiv2 library. Run the following command to get the image: 
+#  $ dot -Tgif -oexiv2.gif exiv2.dot
 ################################################################################
 
 digraph G {
diff --git a/src/Makefile b/src/Makefile
index 20f9d30f..c784a8f7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 #
 # File:      Makefile
-# Version:   $Name:  $ $Revision: 1.32 $
+# Version:   $Rev$
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
diff --git a/src/mn.sh b/src/mn.sh
index 030e7d2e..87ceb592 100755
--- a/src/mn.sh
+++ b/src/mn.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 ################################################################################
 # File     : mn.sh
-# Version  : $Name:  $ $Revision: 1.4 $
+# Version  : $Rev$
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History  : 08-Mar-04, ahu: created
 #