diff --git a/src/DateHandler/_Date_bg.py b/src/DateHandler/_Date_bg.py
index f0c88fdf6..93d05db26 100644
--- a/src/DateHandler/_Date_bg.py
+++ b/src/DateHandler/_Date_bg.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _Date_bg.py 9101 2007-10-08 16:41:39Z dallingham $
+# $Id$
 
 """
 Bulgarian-specific classes for parsing and displaying dates.
diff --git a/src/Filters/Rules/Person/_NoDeathdate.py b/src/Filters/Rules/Person/_NoDeathdate.py
index 0d6c23499..49f0ca1a3 100644
--- a/src/Filters/Rules/Person/_NoDeathdate.py
+++ b/src/Filters/Rules/Person/_NoDeathdate.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _NoDeathdate.py 14091 2010-01-18 04:42:17Z pez4brian $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py b/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py
index 6032dd6dd..cd5039297 100644
--- a/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py
+++ b/src/Filters/Rules/Source/_MatchesTitleSubstringOf.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/MacTransUtils.py b/src/MacTransUtils.py
index 6a73f246b..6332895fc 100644
--- a/src/MacTransUtils.py
+++ b/src/MacTransUtils.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 ###
 # Mac Localization Functions
 ###
diff --git a/src/Merge/__init__.py b/src/Merge/__init__.py
index 54d871f5d..f092240b1 100644
--- a/src/Merge/__init__.py
+++ b/src/Merge/__init__.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: __init__.py 15645 2010-07-22 02:16:32Z dsblank $
+# $Id$
 
 """
 """
diff --git a/src/Merge/mergeplace.py b/src/Merge/mergeplace.py
index 1af341462..921f6952b 100644
--- a/src/Merge/mergeplace.py
+++ b/src/Merge/mergeplace.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 """
 Provide merge capabilities for places.
diff --git a/src/Merge/mergesource.py b/src/Merge/mergesource.py
index 429a75612..987e51c88 100644
--- a/src/Merge/mergesource.py
+++ b/src/Merge/mergesource.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 """
 Provide merge capabilities for sources.
diff --git a/src/gen/plug/report/__init__.py b/src/gen/plug/report/__init__.py
index cf817591d..1c5c5ae76 100644
--- a/src/gen/plug/report/__init__.py
+++ b/src/gen/plug/report/__init__.py
@@ -23,7 +23,7 @@
 
 # gen.plug.report.__init__
 #
-# $Id: __init__.py 12360 2009-03-19 02:32:16Z pez4brian $
+# $Id$
 
 "Report Generation Framework"
 
diff --git a/src/gen/plug/report/_bibliography.py b/src/gen/plug/report/_bibliography.py
index cee5ff8b5..fb02dddb7 100644
--- a/src/gen/plug/report/_bibliography.py
+++ b/src/gen/plug/report/_bibliography.py
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: _Bibliography.py 13191 2009-09-10 18:49:48Z gbritton $
+# $Id$
 
 """
 Contain and organize bibliographic information.
diff --git a/src/gen/plug/report/_constants.py b/src/gen/plug/report/_constants.py
index 36e1c32c4..7cfa933ce 100644
--- a/src/gen/plug/report/_constants.py
+++ b/src/gen/plug/report/_constants.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _Constants.py 15146 2010-04-15 14:37:18Z robhealey1 $
+# $Id$
 
 "Report Generation Framework"
 
diff --git a/src/gen/plug/report/_options.py b/src/gen/plug/report/_options.py
index 7fc51fcca..899991305 100644
--- a/src/gen/plug/report/_options.py
+++ b/src/gen/plug/report/_options.py
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: _ReportOptions.py 13346 2009-10-08 01:12:51Z dsblank $
+# $Id$
 
 # Written by Alex Roitman
 
diff --git a/src/gen/plug/report/_paper.py b/src/gen/plug/report/_paper.py
index 78eeff74c..6ff97af25 100644
--- a/src/gen/plug/report/_paper.py
+++ b/src/gen/plug/report/_paper.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _PaperMenu.py 14293 2010-02-09 10:48:11Z ldnp $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gen/plug/report/_reportbase.py b/src/gen/plug/report/_reportbase.py
index 8560a972c..374e60bc4 100644
--- a/src/gen/plug/report/_reportbase.py
+++ b/src/gen/plug/report/_reportbase.py
@@ -21,7 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: _Report.py 12559 2009-05-21 17:19:50Z gbritton $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gen/plug/report/endnotes.py b/src/gen/plug/report/endnotes.py
index c806c0bd0..a873ab642 100644
--- a/src/gen/plug/report/endnotes.py
+++ b/src/gen/plug/report/endnotes.py
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: _Endnotes.py 15169 2010-04-16 20:59:10Z bmcage $
+# $Id$
 
 """
 Provide utilities for printing endnotes in text reports.
diff --git a/src/gui/editors/editlink.py b/src/gui/editors/editlink.py
index 385076453..9d9e23bb9 100644
--- a/src/gui/editors/editlink.py
+++ b/src/gui/editors/editlink.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gui/widgets/multitreeview.py b/src/gui/widgets/multitreeview.py
index 09ada9827..b93b10c4b 100644
--- a/src/gui/widgets/multitreeview.py
+++ b/src/gui/widgets/multitreeview.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 """
 An override to allow easy multiselections.
diff --git a/src/gui/widgets/undoablebuffer.py b/src/gui/widgets/undoablebuffer.py
index 4cd8951bc..36c4d7f1f 100644
--- a/src/gui/widgets/undoablebuffer.py
+++ b/src/gui/widgets/undoablebuffer.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 """ 
 gtk textbuffer with undo functionality 
diff --git a/src/gui/widgets/undoableentry.py b/src/gui/widgets/undoableentry.py
index e1a22dfa2..aa56acf6b 100644
--- a/src/gui/widgets/undoableentry.py
+++ b/src/gui/widgets/undoableentry.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: validatedmaskedentry.py 14091 2010-01-18 04:42:17Z pez4brian $
+# $Id$
 
 __all__ = ["UndoableEntry"]
 
diff --git a/src/gui/widgets/undoablestyledbuffer.py b/src/gui/widgets/undoablestyledbuffer.py
index ce6f1cb62..498f7da6f 100644
--- a/src/gui/widgets/undoablestyledbuffer.py
+++ b/src/gui/widgets/undoablestyledbuffer.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: $
+# $Id$
 
 """ 
 gtk textbuffer with undo functionality 
diff --git a/src/plugins/lib/libtreebase.py b/src/plugins/lib/libtreebase.py
index 60ffd6532..a1db33324 100644
--- a/src/plugins/lib/libtreebase.py
+++ b/src/plugins/lib/libtreebase.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: Descendant.py .... ander882 $
+# $Id$
 
 """Reports/Graphical Reports/Tree_Base"""
 
diff --git a/src/plugins/quickview/LinkReferences.py b/src/plugins/quickview/LinkReferences.py
index 1e4891f6f..2526fedc0 100644
--- a/src/plugins/quickview/LinkReferences.py
+++ b/src/plugins/quickview/LinkReferences.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-# $Id: $
+# $Id$
 #
 
 """
diff --git a/src/plugins/tool/toolsdebug.gpr.py b/src/plugins/tool/toolsdebug.gpr.py
index a0985b161..e2ea368b0 100644
--- a/src/plugins/tool/toolsdebug.gpr.py
+++ b/src/plugins/tool/toolsdebug.gpr.py
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: tools.gpr.py 14300 2010-02-10 12:13:47Z dsblank $
+# $Id$
 
 """
 GRAMPS registration file
diff --git a/src/plugins/view/htmlrenderer.gpr.py b/src/plugins/view/htmlrenderer.gpr.py
index c275b98f1..5ab62e175 100644
--- a/src/plugins/view/htmlrenderer.gpr.py
+++ b/src/plugins/view/htmlrenderer.gpr.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: htmlrenderer.gpr.py 17129 2011-04-15 18:43:37Z noirauds $
+# $Id$
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/view/personlistview.py b/src/plugins/view/personlistview.py
index efc1a4d72..0183f1f41 100644
--- a/src/plugins/view/personlistview.py
+++ b/src/plugins/view/personlistview.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: placetreeview.py 14176 2010-02-01 07:01:45Z bmcage $
+# $Id$
 
 """
 Person list View
diff --git a/src/plugins/view/persontreeview.py b/src/plugins/view/persontreeview.py
index 86c460b48..840de066d 100644
--- a/src/plugins/view/persontreeview.py
+++ b/src/plugins/view/persontreeview.py
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-# $Id: placetreeview.py 14176 2010-02-01 07:01:45Z bmcage $
+# $Id$
 
 """
 Person Tree View