diff --git a/Makefile b/Makefile
index e8cef22..803dc7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 VERSION:=$(shell git describe --abbrev=6 HEAD | sed 's/R//;s/_/./;s/-/./;s/-.*$$/-SNAPSHOT/')
 TAGVERSION=$(shell echo $(VERSION) | sed 's/\./_/g')
 BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz
diff --git a/TODO b/TODO
index 03b6ca8..42d1f54 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-$Id$
-
 When UMLGraph 2.29 comes out use <i></i> for italic fonts?
 
 http://stackoverflow.com/questions/8609546/umlgraph-not-automatic-integrated-in-javadoc
diff --git a/build.xml b/build.xml
index da40197..b3854f8 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,6 @@
 
 <description>
 	The specification for the Java-based umlgraph build processes.
-	$Id$
 </description>
 
 <!-- set global properties for this build -->
diff --git a/doc/GUI-DB.pic b/doc/GUI-DB.pic
index 76a7f56..361619c 100644
--- a/doc/GUI-DB.pic
+++ b/doc/GUI-DB.pic
@@ -13,7 +13,6 @@
 # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 # MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/Makefile b/doc/Makefile
index 0b461f5..2446978 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
 
 ROOT=/cygdrive/c
diff --git a/doc/Root.java b/doc/Root.java
index 3be3c49..ea99a08 100644
--- a/doc/Root.java
+++ b/doc/Root.java
@@ -1,5 +1,4 @@
 // Author:  Vadim Nasardinov
-// Version: $Id$
 
 import java.util.List;
 import java.util.Map;
diff --git a/doc/RootViews.java b/doc/RootViews.java
index 880cc8c..bd69ca8 100644
--- a/doc/RootViews.java
+++ b/doc/RootViews.java
@@ -1,6 +1,5 @@
 // Author:  Vadim Nasardinov
 // Author:  Andrea Aime
-// Version: $Id$
 
 import java.util.List;
 import java.util.Map;
@@ -64,4 +63,4 @@ class DetailedView {}
 /**
  * @view
  */
-class Overview {}
\ No newline at end of file
+class Overview {}
diff --git a/doc/ack.xml b/doc/ack.xml
index 46c5696..aa7dc8a 100644
--- a/doc/ack.xml
+++ b/doc/ack.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <p>
 UMLGraph was developed and is being maintained by
diff --git a/doc/advrel.java b/doc/advrel.java
index 588520f..db5e59a 100644
--- a/doc/advrel.java
+++ b/doc/advrel.java
@@ -1,7 +1,6 @@
 /*
  * Advanced relationships
  * UML User Guide p. 137
- * $Id$
  */
 
 /**
diff --git a/doc/ant.xml b/doc/ant.xml
index b5fc7e5..c81a98c 100644
--- a/doc/ant.xml
+++ b/doc/ant.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 To run the UMLGraph doclet from <em>ant</em>, use a rule,
 like the following.
diff --git a/doc/assoc.java b/doc/assoc.java
index 63a2005..40b5afa 100644
--- a/doc/assoc.java
+++ b/doc/assoc.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Associations with visibility
diff --git a/doc/car.java b/doc/car.java
index ffbaf72..fae2b4b 100644
--- a/doc/car.java
+++ b/doc/car.java
@@ -1,4 +1,3 @@
-// $Id$
 
 class Tyre {}
 class Engine {}
diff --git a/doc/catalina.java b/doc/catalina.java
index 05f4962..7d793a3 100644
--- a/doc/catalina.java
+++ b/doc/catalina.java
@@ -1,6 +1,5 @@
 /*
  * Interface and generalization relationships in Jakarta Catalina
- * $Id$
  */
 
 /**
diff --git a/doc/cd-intro.xml b/doc/cd-intro.xml
index 713a4c8..07b7fef 100644
--- a/doc/cd-intro.xml
+++ b/doc/cd-intro.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-7" ?>
-<!-- $Id$ -->
 <notes>
 One specifies a class diagram using the Java syntax complemented by
 <a href="http://java.sun.com/j2se/javadoc/"><em>javadoc</em></a>
diff --git a/doc/cd-model.xml b/doc/cd-model.xml
index 0682650..0efa085 100644
--- a/doc/cd-model.xml
+++ b/doc/cd-model.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The UMLGraph class diagrams allows you to model
 <ul>
diff --git a/doc/cd-note.xml b/doc/cd-note.xml
index b784126..e8fe992 100644
--- a/doc/cd-note.xml
+++ b/doc/cd-note.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 In UMLGraph you can easily add a note (comment) to an element,
 using the <code>@note</code> tag.
diff --git a/doc/cd-oper.xml b/doc/cd-oper.xml
index b5ad539..5fdbe3c 100644
--- a/doc/cd-oper.xml
+++ b/doc/cd-oper.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 UMLGraph's input follows the Java syntax and semantics.
 However,
diff --git a/doc/cd-opt-spec.xml b/doc/cd-opt-spec.xml
index faeb78c..c34d41a 100644
--- a/doc/cd-opt-spec.xml
+++ b/doc/cd-opt-spec.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Since the options are really a part of the generated graph you
 want in many cases to include them in the diagram specification.
diff --git a/doc/cd-opt.xml b/doc/cd-opt.xml
index 7ad9839..836f8b9 100644
--- a/doc/cd-opt.xml
+++ b/doc/cd-opt.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 A number of options contol the operation of UMLGraph
 class diagram generator.
diff --git a/doc/cd-umldoc.xml b/doc/cd-umldoc.xml
index 5a11264..c76807a 100644
--- a/doc/cd-umldoc.xml
+++ b/doc/cd-umldoc.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 UmlGraphDoc is a standard doclet wrapper that combines
 the standard doclet output (javadoc documentation) along with auto-generated
diff --git a/doc/ceg-adv.xml b/doc/ceg-adv.xml
index b0e6bbe..29c5075 100644
--- a/doc/ceg-adv.xml
+++ b/doc/ceg-adv.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-at.xml b/doc/ceg-at.xml
index 5eb5e60..1361cdb 100644
--- a/doc/ceg-at.xml
+++ b/doc/ceg-at.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-cat.xml b/doc/ceg-cat.xml
index 0c13d2a..5fa964c 100644
--- a/doc/ceg-cat.xml
+++ b/doc/ceg-cat.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <fmtcode ext="java">
 /*
diff --git a/doc/ceg-color.xml b/doc/ceg-color.xml
index c81648f..30a58a7 100644
--- a/doc/ceg-color.xml
+++ b/doc/ceg-color.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-er.xml b/doc/ceg-er.xml
index a05be99..19ab1c4 100644
--- a/doc/ceg-er.xml
+++ b/doc/ceg-er.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id: ceg-schema.xml,v 1.1 2005/11/23 22:21:22 dds Exp $ -->
 <notes>
 The following was generated by annotating the source code of the
 <a href="http://www.sqo-oss.org">SQO-OSS</a> project.
diff --git a/doc/ceg-ev.xml b/doc/ceg-ev.xml
index ab33ffb..e9720ec 100644
--- a/doc/ceg-ev.xml
+++ b/doc/ceg-ev.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-gen.xml b/doc/ceg-gen.xml
index 88b754b..7e8456a 100644
--- a/doc/ceg-gen.xml
+++ b/doc/ceg-gen.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-infer.xml b/doc/ceg-infer.xml
index e5d1ee6..dc8e0e9 100644
--- a/doc/ceg-infer.xml
+++ b/doc/ceg-infer.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-mv.xml b/doc/ceg-mv.xml
index 606bbda..4e59ab6 100644
--- a/doc/ceg-mv.xml
+++ b/doc/ceg-mv.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Vadim Nasardinov noted that an advantage of UMLGraph over many
 GUI-oriented UML drawing tools is the ability
@@ -16,7 +15,6 @@ a Makefile illustrates a way to organize this process.
 <h2>Java Description</h2>
 <fmtcode ext="java">
 // Author:  Vadim Nasardinov
-// Version: $Id$
 
 import java.util.List;
 import java.util.Map;
@@ -63,7 +61,6 @@ class DataOperation extends Element {}
 <fmtcode ext="mak">
 # Author:  Vadim Nasardinov (vadimn@redhat.com)
 # Since:   2004-05-26
-# Version: $Id$
 # See:     http://www.spinellis.gr/sw/umlgraph/doc/ceg-mv.html
 
 # Requires: graphviz
diff --git a/doc/ceg-schema.xml b/doc/ceg-schema.xml
index d11350d..94155c7 100644
--- a/doc/ceg-schema.xml
+++ b/doc/ceg-schema.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-shape.xml b/doc/ceg-shape.xml
index d9c06e6..be6b53a 100644
--- a/doc/ceg-shape.xml
+++ b/doc/ceg-shape.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <fmtcode ext="java">
 /**
diff --git a/doc/ceg-ster.xml b/doc/ceg-ster.xml
index 4657b4c..bfdc9cc 100644
--- a/doc/ceg-ster.xml
+++ b/doc/ceg-ster.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <table>
 <tr><td>
diff --git a/doc/ceg-view-details.xml b/doc/ceg-view-details.xml
index b2e249c..0de80a7 100644
--- a/doc/ceg-view-details.xml
+++ b/doc/ceg-view-details.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The makefile-based multiple view example can be generated by using internal
 view support by means of the following sources (note the use of UmlOptions
@@ -9,7 +8,6 @@ diagrams at different detail level).
 <fmtcode ext="java">
 // Author:  Vadim Nasardinov
 // Author:  Andrea Aime
-// Version: $Id$
 
 import java.util.List;
 import java.util.Map;
diff --git a/doc/ceg-view-packages.xml b/doc/ceg-view-packages.xml
index 3ac9f99..dd741bd 100644
--- a/doc/ceg-view-packages.xml
+++ b/doc/ceg-view-packages.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Views are especially interesting in big projects, since they allow to
 generate package specific diagrams and overview diagrams in a quick and
diff --git a/doc/ceg-view-spec.xml b/doc/ceg-view-spec.xml
index ee559d3..fde7c61 100644
--- a/doc/ceg-view-spec.xml
+++ b/doc/ceg-view-spec.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Views are special classes that allow the generation of a custom class
 diagram based on a set of diagram global options and a set of option
diff --git a/doc/class-eg.java b/doc/class-eg.java
index 3c1e7f0..86cc7bf 100644
--- a/doc/class-eg.java
+++ b/doc/class-eg.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * @opt nodefillcolor ".13 .9 1"
diff --git a/doc/classadd.java b/doc/classadd.java
index 2567ef9..4252ee2 100644
--- a/doc/classadd.java
+++ b/doc/classadd.java
@@ -1,7 +1,6 @@
 /*
  * Class stereotypes and tagged values
  * UML User Guide p. 439
- * $Id$
  */
 
 /**
diff --git a/doc/color.java b/doc/color.java
index 9977814..c90c43c 100644
--- a/doc/color.java
+++ b/doc/color.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * @opt edgecolor "yellow"
diff --git a/doc/deriv.xml b/doc/deriv.xml
index d1a3e2b..0c4e671 100644
--- a/doc/deriv.xml
+++ b/doc/deriv.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Here are other programs or efforts that build on UMLGraph's
 code or ideas.
diff --git a/doc/dist-52.pic b/doc/dist-52.pic
index 75d8c78..405c1ac 100644
--- a/doc/dist-52.pic
+++ b/doc/dist-52.pic
@@ -1,6 +1,5 @@
 # UML Distilled: Figure 5-2 p. 70
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/dist-52.xml b/doc/dist-52.xml
index 140b3b8..5f46a65 100644
--- a/doc/dist-52.xml
+++ b/doc/dist-52.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, based on the diagram appearing on p. 70 of
 UML Distilled, contains self calls, object activation,
diff --git a/doc/dns.xml b/doc/dns.xml
index 3932ee9..bda7e26 100644
--- a/doc/dns.xml
+++ b/doc/dns.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, illustrates the operating system calls of
 a typical DNS query.
@@ -17,7 +16,6 @@ drawing facility.
 #
 # DNS query collaboration diagram
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/dnsq.pic b/doc/dnsq.pic
index c6a1468..4a816f1 100644
--- a/doc/dnsq.pic
+++ b/doc/dnsq.pic
@@ -4,7 +4,6 @@
 #
 # DNS query collaboration diagram
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/faq.xml b/doc/faq.xml
index 7b53fb9..5d4e398 100644
--- a/doc/faq.xml
+++ b/doc/faq.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 
 <!--
diff --git a/doc/general.java b/doc/general.java
index e299db5..8fa9553 100644
--- a/doc/general.java
+++ b/doc/general.java
@@ -1,7 +1,6 @@
 /*
  * Generalisation
  * UML User Guide p. 141
- * $Id$
  */
 
 /* Basic categorisations */
diff --git a/doc/gui-db.xml b/doc/gui-db.xml
index f719982..b10db98 100644
--- a/doc/gui-db.xml
+++ b/doc/gui-db.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following sequence diagram demonstrates the use of the frame and comment elements.
 <h2>Diagram</h2>
diff --git a/doc/index.xml b/doc/index.xml
index 9d9da66..c6c0f7f 100644
--- a/doc/index.xml
+++ b/doc/index.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <index>
 <ch><ti>Introduction</ti><fi>intro</fi></ch>
 <ch><ti>Installation</ti><fi>install</fi></ch>
diff --git a/doc/infer.java b/doc/infer.java
index 0406ecc..bc1b7a3 100644
--- a/doc/infer.java
+++ b/doc/infer.java
@@ -1,6 +1,5 @@
 /*
  * Relationship inference
- * $Id$
  */
 
 import java.util.List;
diff --git a/doc/install.xml b/doc/install.xml
index 87bfed7..09cb684 100644
--- a/doc/install.xml
+++ b/doc/install.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-7" ?>
-<!-- $Id$ -->
 <notes>
 To install UmlGraph follow these steps.
 <ol>
diff --git a/doc/intro.xml b/doc/intro.xml
index b5ec4de..57e4fa1 100644
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 UMLGraph allows the declarative specification and drawing of
 UML class and sequence diagrams.
diff --git a/doc/schema.java b/doc/schema.java
index 92f638a..8d25f92 100644
--- a/doc/schema.java
+++ b/doc/schema.java
@@ -1,7 +1,6 @@
 /*
  * Schema model
  * UML User Guide p. 112
- * $Id$
  */
 
 /** 
diff --git a/doc/seq-cd.pic b/doc/seq-cd.pic
index 1b185f2..535afe3 100644
--- a/doc/seq-cd.pic
+++ b/doc/seq-cd.pic
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
 .PS
 
diff --git a/doc/seq-cd.xml b/doc/seq-cd.xml
index a97a015..c3df8a2 100644
--- a/doc/seq-cd.xml
+++ b/doc/seq-cd.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Objects do not always appear at the top of a UML sequence diagram;
 they are often constructed by other objects.
diff --git a/doc/seq-eg.pic b/doc/seq-eg.pic
index bc02d80..bf1fee0 100644
--- a/doc/seq-eg.pic
+++ b/doc/seq-eg.pic
@@ -1,6 +1,5 @@
 # UML User Guide: Appendix A,p. 436
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/seq-impr.pic b/doc/seq-impr.pic
index 3a2593d..7cfbd30 100644
--- a/doc/seq-impr.pic
+++ b/doc/seq-impr.pic
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
 .PS
 
diff --git a/doc/seq-impr.xml b/doc/seq-impr.xml
index cb61a37..d9e15d0 100644
--- a/doc/seq-impr.xml
+++ b/doc/seq-impr.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Let us try to improve the simple sequence diagram.
 <fmtcode ext="pic">
diff --git a/doc/seq-intro.xml b/doc/seq-intro.xml
index 9db93d2..9359ea2 100644
--- a/doc/seq-intro.xml
+++ b/doc/seq-intro.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 One specifies a sequence diagram using <em>pic</em> macros to define
 objects and method invocations.
diff --git a/doc/seq-ops.xml b/doc/seq-ops.xml
index 309db85..7d6d09b 100644
--- a/doc/seq-ops.xml
+++ b/doc/seq-ops.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- $Id$ -->
 <notes>
 The following calls can be used to define a sequence diagram.
 <dl>
diff --git a/doc/seq-simple.pic b/doc/seq-simple.pic
index fbb3a61..3931cbb 100644
--- a/doc/seq-simple.pic
+++ b/doc/seq-simple.pic
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
 .PS
 
diff --git a/doc/seq-simple.xml b/doc/seq-simple.xml
index 4055804..002f9dd 100644
--- a/doc/seq-simple.xml
+++ b/doc/seq-simple.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 A sequence diagram is defined in three main phases:
 <ol>
diff --git a/doc/seq-syntax.xml b/doc/seq-syntax.xml
index 2e7d597..e0b874c 100644
--- a/doc/seq-syntax.xml
+++ b/doc/seq-syntax.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Sequence diagrams consist of objects, their lifelines
 (also known as smimming lanes),
diff --git a/doc/seq-var.xml b/doc/seq-var.xml
index fb383a9..10d15ff 100644
--- a/doc/seq-var.xml
+++ b/doc/seq-var.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The value of
 <em>pic</em> variables can sometimes be modified by assignment
diff --git a/doc/sequence.pic b/doc/sequence.pic
index 35e443e..93721c7 100644
--- a/doc/sequence.pic
+++ b/doc/sequence.pic
@@ -14,7 +14,6 @@
 # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 # MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id$
 #
 
 
diff --git a/doc/uml-182.pic b/doc/uml-182.pic
index 1b64bd6..75c24d3 100644
--- a/doc/uml-182.pic
+++ b/doc/uml-182.pic
@@ -1,6 +1,5 @@
 # UML User Guide: Figure 18-2
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/uml-182.xml b/doc/uml-182.xml
index 84f8e35..b39c95b 100644
--- a/doc/uml-182.xml
+++ b/doc/uml-182.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, based on the one appearing on p. 247 of the
 UML User Guide, illustrates the dynamic creation and destruction of
diff --git a/doc/uml-184.pic b/doc/uml-184.pic
index ec127ba..ab04a55 100644
--- a/doc/uml-184.pic
+++ b/doc/uml-184.pic
@@ -1,6 +1,5 @@
 # UML User Guide: Figure 18-4
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/uml-184.xml b/doc/uml-184.xml
index e191644..a4adb65 100644
--- a/doc/uml-184.xml
+++ b/doc/uml-184.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, based on Figure 18-4 appearing on p. 252 of the
 UML User Guide, illustrates constraints on an object's lifeline,
diff --git a/doc/uml-71.pic b/doc/uml-71.pic
index 8d4f8c8..053ebbc 100644
--- a/doc/uml-71.pic
+++ b/doc/uml-71.pic
@@ -1,6 +1,5 @@
 # UML User Guide Figure 7-1.
 #
-# $Id$
 #
 .PS
 
diff --git a/doc/uml-71.xml b/doc/uml-71.xml
index 930f1c7..c7520cf 100644
--- a/doc/uml-71.xml
+++ b/doc/uml-71.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, based on Figure 7-1 appearing on p. 102 of the
 UML User Guide, illustrates an interaction diagram with an
diff --git a/doc/uml-appa.pic b/doc/uml-appa.pic
index 6658e56..c99a668 100644
--- a/doc/uml-appa.pic
+++ b/doc/uml-appa.pic
@@ -1,6 +1,5 @@
 # UML User Guide: Appendix A,p. 436
 #
-# $Id$
 #
 
 .PS
diff --git a/doc/uml-appa.xml b/doc/uml-appa.xml
index cc205d6..12e3449 100644
--- a/doc/uml-appa.xml
+++ b/doc/uml-appa.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 The following diagram, based on the one appearing on p. 436 of the
 UML User Guide, contains the most important elements
diff --git a/doc/ver.xml b/doc/ver.xml
index 1277b30..86c2814 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 <dl>
 
diff --git a/doc/views.xml b/doc/views.xml
index f9a3e5c..fb8322f 100644
--- a/doc/views.xml
+++ b/doc/views.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <notes>
 Documenting a big project often requires multiple diagrams:
 each to show a specific and limited portion of the system.
diff --git a/doc/vis.java b/doc/vis.java
index 984a541..46fa771 100644
--- a/doc/vis.java
+++ b/doc/vis.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Attribute and operation visility
diff --git a/sequence.pic b/sequence.pic
index 35e443e..93721c7 100644
--- a/sequence.pic
+++ b/sequence.pic
@@ -14,7 +14,6 @@
 # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 # MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id$
 #
 
 
diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
index 7abe2f2..f96cbcc 100644
--- a/src/main/java/org/umlgraph/doclet/ClassGraph.java
+++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/ClassInfo.java b/src/main/java/org/umlgraph/doclet/ClassInfo.java
index 887b91e..75727cf 100644
--- a/src/main/java/org/umlgraph/doclet/ClassInfo.java
+++ b/src/main/java/org/umlgraph/doclet/ClassInfo.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/ClassMatcher.java b/src/main/java/org/umlgraph/doclet/ClassMatcher.java
index 59bd076..9665376 100644
--- a/src/main/java/org/umlgraph/doclet/ClassMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/ClassMatcher.java
@@ -12,7 +12,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
index a2b397f..47895af 100644
--- a/src/main/java/org/umlgraph/doclet/ContextMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
@@ -12,7 +12,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/OptionProvider.java b/src/main/java/org/umlgraph/doclet/OptionProvider.java
index 72cdf7e..8287780 100644
--- a/src/main/java/org/umlgraph/doclet/OptionProvider.java
+++ b/src/main/java/org/umlgraph/doclet/OptionProvider.java
@@ -12,7 +12,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java
index 16de910..1580dd9 100644
--- a/src/main/java/org/umlgraph/doclet/Options.java
+++ b/src/main/java/org/umlgraph/doclet/Options.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/PatternMatcher.java b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
index 79e11c6..84a1fb1 100644
--- a/src/main/java/org/umlgraph/doclet/PatternMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
@@ -12,7 +12,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 package org.umlgraph.doclet;
diff --git a/src/main/java/org/umlgraph/doclet/Shape.java b/src/main/java/org/umlgraph/doclet/Shape.java
index 9faad6a..b1b9870 100644
--- a/src/main/java/org/umlgraph/doclet/Shape.java
+++ b/src/main/java/org/umlgraph/doclet/Shape.java
@@ -13,7 +13,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/StringUtil.java b/src/main/java/org/umlgraph/doclet/StringUtil.java
index 8bd67aa..2aa9eac 100644
--- a/src/main/java/org/umlgraph/doclet/StringUtil.java
+++ b/src/main/java/org/umlgraph/doclet/StringUtil.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/UmlGraph.java b/src/main/java/org/umlgraph/doclet/UmlGraph.java
index 0c1fdbc..7087772 100644
--- a/src/main/java/org/umlgraph/doclet/UmlGraph.java
+++ b/src/main/java/org/umlgraph/doclet/UmlGraph.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
index ce9e098..caeb0b1 100644
--- a/src/main/java/org/umlgraph/doclet/Version.java
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -1,4 +1,4 @@
 /* Automatically generated file */
 package org.umlgraph.doclet;
-class Version { public static String VERSION = "R5_6_6-8-g8d7759";}
+class Version { public static String VERSION = "R5_6_6-10-gc1d994";}
 	
\ No newline at end of file
diff --git a/src/main/java/org/umlgraph/doclet/View.java b/src/main/java/org/umlgraph/doclet/View.java
index 56ca7fe..808afd7 100644
--- a/src/main/java/org/umlgraph/doclet/View.java
+++ b/src/main/java/org/umlgraph/doclet/View.java
@@ -12,7 +12,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 package org.umlgraph.doclet;
diff --git a/src/main/java/org/umlgraph/doclet/Visibility.java b/src/main/java/org/umlgraph/doclet/Visibility.java
index 90f5a40..0e631f6 100644
--- a/src/main/java/org/umlgraph/doclet/Visibility.java
+++ b/src/main/java/org/umlgraph/doclet/Visibility.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 package org.umlgraph.doclet;
diff --git a/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java b/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
index 8cd58ca..dd90a9e 100644
--- a/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
+++ b/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java b/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
index d7378d5..0bfc396 100644
--- a/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
+++ b/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/BasicTest.java b/src/test/java/org/umlgraph/test/BasicTest.java
index 3964d23..7ceeae0 100644
--- a/src/test/java/org/umlgraph/test/BasicTest.java
+++ b/src/test/java/org/umlgraph/test/BasicTest.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/DotDiff.java b/src/test/java/org/umlgraph/test/DotDiff.java
index 57ca232..32ae72a 100644
--- a/src/test/java/org/umlgraph/test/DotDiff.java
+++ b/src/test/java/org/umlgraph/test/DotDiff.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/RunDoc.java b/src/test/java/org/umlgraph/test/RunDoc.java
index 863be6f..3a7f525 100644
--- a/src/test/java/org/umlgraph/test/RunDoc.java
+++ b/src/test/java/org/umlgraph/test/RunDoc.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/RunOne.java b/src/test/java/org/umlgraph/test/RunOne.java
index bfc88b4..e2f7b8c 100644
--- a/src/test/java/org/umlgraph/test/RunOne.java
+++ b/src/test/java/org/umlgraph/test/RunOne.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/SimpleFileFilter.java b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
index 517f78f..9c3b123 100644
--- a/src/test/java/org/umlgraph/test/SimpleFileFilter.java
+++ b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 package org.umlgraph.test;
diff --git a/src/test/java/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java
index ec8a02c..119c108 100644
--- a/src/test/java/org/umlgraph/test/TestUtils.java
+++ b/src/test/java/org/umlgraph/test/TestUtils.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 
diff --git a/src/test/java/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java
index 408e8a4..c5a2c5f 100644
--- a/src/test/java/org/umlgraph/test/UmlDocTest.java
+++ b/src/test/java/org/umlgraph/test/UmlDocTest.java
@@ -14,7 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id$
  *
  */
 package org.umlgraph.test;
diff --git a/testdata/java/Abstr.java b/testdata/java/Abstr.java
index 241d65f..d8c8448 100644
--- a/testdata/java/Abstr.java
+++ b/testdata/java/Abstr.java
@@ -1,4 +1,3 @@
-// $Id$
 package test;
 
 /**
diff --git a/testdata/java/Inference.java b/testdata/java/Inference.java
index 2d76faf..31c7faf 100644
--- a/testdata/java/Inference.java
+++ b/testdata/java/Inference.java
@@ -1,4 +1,3 @@
-// $Id$
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/testdata/java/Irp.java b/testdata/java/Irp.java
index d895a8e..4da0c6c 100644
--- a/testdata/java/Irp.java
+++ b/testdata/java/Irp.java
@@ -1,4 +1,3 @@
-// $Id$
 class Application {}
 
 class IrpApplication extends Application {}
diff --git a/testdata/java/MultiAssoc.java b/testdata/java/MultiAssoc.java
index a7811f7..35a2e6f 100644
--- a/testdata/java/MultiAssoc.java
+++ b/testdata/java/MultiAssoc.java
@@ -1,4 +1,3 @@
-// $Id$
 // Regression test: there was a bug that made UMLGraph skip all associations
 // of one kind if the first one was not to be printed (and more in general,
 // to skip all those that followed the one with a hidden destination)
diff --git a/testdata/java/MyVector.java b/testdata/java/MyVector.java
index 94f06d4..af4109f 100644
--- a/testdata/java/MyVector.java
+++ b/testdata/java/MyVector.java
@@ -1,4 +1,3 @@
-// $Id$
 import java.util.*;
 
 /**
diff --git a/testdata/java/Root.java b/testdata/java/Root.java
index 3be3c49..ea99a08 100644
--- a/testdata/java/Root.java
+++ b/testdata/java/Root.java
@@ -1,5 +1,4 @@
 // Author:  Vadim Nasardinov
-// Version: $Id$
 
 import java.util.List;
 import java.util.Map;
diff --git a/testdata/java/RunnableRef.java b/testdata/java/RunnableRef.java
index 11ba822..323eeb8 100644
--- a/testdata/java/RunnableRef.java
+++ b/testdata/java/RunnableRef.java
@@ -1,4 +1,3 @@
-// $Id$
 package test;
 
 /**
diff --git a/testdata/java/Style.java b/testdata/java/Style.java
index 67329e2..6824eca 100644
--- a/testdata/java/Style.java
+++ b/testdata/java/Style.java
@@ -1,4 +1,3 @@
-// $Id$
 package net.sf.whatever.test;
 
 /**
diff --git a/testdata/java/TestHideOp.java b/testdata/java/TestHideOp.java
index 1512895..8737c03 100644
--- a/testdata/java/TestHideOp.java
+++ b/testdata/java/TestHideOp.java
@@ -1,4 +1,3 @@
-// $Id$
 package test;
 
 /**
diff --git a/testdata/java/advrel.java b/testdata/java/advrel.java
index 588520f..db5e59a 100644
--- a/testdata/java/advrel.java
+++ b/testdata/java/advrel.java
@@ -1,7 +1,6 @@
 /*
  * Advanced relationships
  * UML User Guide p. 137
- * $Id$
  */
 
 /**
diff --git a/testdata/java/assoc.java b/testdata/java/assoc.java
index 63a2005..40b5afa 100644
--- a/testdata/java/assoc.java
+++ b/testdata/java/assoc.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Associations with visibility
diff --git a/testdata/java/car.java b/testdata/java/car.java
index 7237b6a..dc312dc 100644
--- a/testdata/java/car.java
+++ b/testdata/java/car.java
@@ -1,4 +1,3 @@
-// $Id$
 class Tyre {}
 class Engine {}
 class Body {}
diff --git a/testdata/java/catalina.java b/testdata/java/catalina.java
index 500c164..d6b6e90 100644
--- a/testdata/java/catalina.java
+++ b/testdata/java/catalina.java
@@ -1,6 +1,5 @@
 /*
  * Interface and generalization relationships in Jakarta Catalina
- * $Id$
  */
 
 class HttpResponseBase
diff --git a/testdata/java/class-eg.java b/testdata/java/class-eg.java
index 3c1e7f0..86cc7bf 100644
--- a/testdata/java/class-eg.java
+++ b/testdata/java/class-eg.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * @opt nodefillcolor ".13 .9 1"
diff --git a/testdata/java/classadd.java b/testdata/java/classadd.java
index 45b650c..004bf3d 100644
--- a/testdata/java/classadd.java
+++ b/testdata/java/classadd.java
@@ -1,7 +1,6 @@
 /*
  * Class stereotypes and tagged values
  * UML User Guide p. 439
- * $Id$
  */
 
 /** 
diff --git a/testdata/java/color.java b/testdata/java/color.java
index ac14658..4791832 100644
--- a/testdata/java/color.java
+++ b/testdata/java/color.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * @opt edgecolor "yellow"
diff --git a/testdata/java/ctor.java b/testdata/java/ctor.java
index a49ea2a..2fe53f8 100644
--- a/testdata/java/ctor.java
+++ b/testdata/java/ctor.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * @opt all
diff --git a/testdata/java/disable.java b/testdata/java/disable.java
index c3b2c16..57b601c 100644
--- a/testdata/java/disable.java
+++ b/testdata/java/disable.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Locally disable an option (test)
diff --git a/testdata/java/extends.java b/testdata/java/extends.java
index 321f41c..6cd4188 100644
--- a/testdata/java/extends.java
+++ b/testdata/java/extends.java
@@ -1,4 +1,3 @@
-// $Id$
 
 class Base {}
 class Test2<B extends a.b.Base> {}
diff --git a/testdata/java/foo.java b/testdata/java/foo.java
index 84c2640..deea263 100644
--- a/testdata/java/foo.java
+++ b/testdata/java/foo.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Associations with visibility
diff --git a/testdata/java/general.java b/testdata/java/general.java
index e299db5..8fa9553 100644
--- a/testdata/java/general.java
+++ b/testdata/java/general.java
@@ -1,7 +1,6 @@
 /*
  * Generalisation
  * UML User Guide p. 141
- * $Id$
  */
 
 /* Basic categorisations */
diff --git a/testdata/java/java5.java b/testdata/java/java5.java
index 48e6e45..dedb786 100644
--- a/testdata/java/java5.java
+++ b/testdata/java/java5.java
@@ -1,4 +1,3 @@
-// $Id$
 import java.util.*;
 
 /**
diff --git a/testdata/java/schema.java b/testdata/java/schema.java
index 92f638a..8d25f92 100644
--- a/testdata/java/schema.java
+++ b/testdata/java/schema.java
@@ -1,7 +1,6 @@
 /*
  * Schema model
  * UML User Guide p. 112
- * $Id$
  */
 
 /** 
diff --git a/testdata/java/strip.java b/testdata/java/strip.java
index f0898fb..d425578 100644
--- a/testdata/java/strip.java
+++ b/testdata/java/strip.java
@@ -1,4 +1,3 @@
-// $Id$
 import java.util.*;
 
 /**
diff --git a/testdata/java/vis.java b/testdata/java/vis.java
index 984a541..46fa771 100644
--- a/testdata/java/vis.java
+++ b/testdata/java/vis.java
@@ -1,4 +1,3 @@
-// $Id$
 
 /**
  * Attribute and operation visility
diff --git a/tools/testupdate.sh b/tools/testupdate.sh
index e5e8dbc..d4895d4 100755
--- a/tools/testupdate.sh
+++ b/tools/testupdate.sh
@@ -6,7 +6,6 @@
 #
 # Diomidis Spinellis. August 2008.
 #
-# $Id$
 #
 
 for i in dot umldoc
diff --git a/tools/viscompare.sh b/tools/viscompare.sh
index cbc273d..4e2332c 100755
--- a/tools/viscompare.sh
+++ b/tools/viscompare.sh
@@ -7,7 +7,6 @@
 # Example: viscompare.sh Category.dot
 # Example2: for i in `cd dot-ref ; ls *.dot`; do ../viscompare.sh $i; done
 #
-# $Id$
 #
 
 filea=`find . -name $1 | sed -n 1p`
diff --git a/umlgraph b/umlgraph
index 71b9022..2119ace 100755
--- a/umlgraph
+++ b/umlgraph
@@ -4,7 +4,6 @@
 # For this to work you must adjust the following defintion of
 # UMLGRAPH_HOME to point to the directory where UmlGraph.jar is installed.
 #
-# $Id$
 #
 
 UMLGRAPH_HOME=lib
diff --git a/umlgraph.bat b/umlgraph.bat
index 4f07b9e..a5e3cd2 100755
--- a/umlgraph.bat
+++ b/umlgraph.bat
@@ -4,8 +4,6 @@ rem Windows batch file to run UMLGraph on the specified base file name
 rem For this to work you must adjust the following defintion of
 rem UMLGRAPH_HOME to point to the directory where UmlGraph.jar is installed.
 
-rem $Id$
-
 set UMLGRAPH_HOME=lib
 
 if not "%2" == "" goto ok
diff --git a/web/bottom.html b/web/bottom.html
index 3929fcf..99028b7 100644
--- a/web/bottom.html
+++ b/web/bottom.html
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 </td></tr></table>
 <hr />
 <p class='footer'>
diff --git a/web/build.sh b/web/build.sh
index 3969da1..30ae2df 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $Id$
 #
 # Create the UMLGraph web pages
 #
diff --git a/web/doc.html b/web/doc.html
index b79d80a..aa968e1 100644
--- a/web/doc.html
+++ b/web/doc.html
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 <h2>UMLGraph Reference Documentation</h2>
 <ul>
 <li> <a href="doc/index.html">User manual</a>
diff --git a/web/download.html b/web/download.html
index 3cc6490..27c1208 100644
--- a/web/download.html
+++ b/web/download.html
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 New releases of UMLGraph are always announced on the corresponding
 <a href="http://freecode.com/projects/umlgraph">(free)code page</a>.
 You can use it to subscribe and post comments.
diff --git a/web/top.html b/web/top.html
index 1366967..fc2eefc 100644
--- a/web/top.html
+++ b/web/top.html
@@ -4,7 +4,6 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <!-- No not edit this page in the web directory. -->
-<!-- $Id$ -->
 <head>
 <title>UMLGraph - Declarative Drawing of UML Diagrams</title>
 <meta name="AUTHOR" content="Diomidis Spinellis" />