diff --git a/backends/fs/ps2/ps2-fs-factory.h b/backends/fs/ps2/ps2-fs-factory.h
index ca2ae670c49..3a1dec252d9 100644
--- a/backends/fs/ps2/ps2-fs-factory.h
+++ b/backends/fs/ps2/ps2-fs-factory.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-13-0/backends/fs/ps2/ps2-fs-factory.h $
- * $Id: ps2-fs-factory.h 35648 2009-01-01 15:06:43Z sev $
+ * $URL$
+ * $Id$
  */
 
 #ifndef PS2_FILESYSTEM_FACTORY_H
diff --git a/backends/platform/gp2x/mmuhack/mmuhack.c b/backends/platform/gp2x/mmuhack/mmuhack.c
index 72eef9b055b..7e27262e5f1 100644
--- a/backends/platform/gp2x/mmuhack/mmuhack.c
+++ b/backends/platform/gp2x/mmuhack/mmuhack.c
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/gp2x/gp2x-mem.cpp $
- * $Id: gp2x-mem.cpp 39708 2009-03-27 14:12:42Z dhewg $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/psp/pspkeyboard.cpp b/backends/platform/psp/pspkeyboard.cpp
index e7e1dbb0114..be8b98a3f81 100644
--- a/backends/platform/psp/pspkeyboard.cpp
+++ b/backends/platform/psp/pspkeyboard.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 43618 2009-08-21 22:44:49Z joostp $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/psp/pspkeyboard.h b/backends/platform/psp/pspkeyboard.h
index 1d2428b2a06..b9681c1e0ee 100644
--- a/backends/platform/psp/pspkeyboard.h
+++ b/backends/platform/psp/pspkeyboard.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.h $
- * $Id: osys_psp.h 43618 2009-08-21 22:44:49Z joostp $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/samsungtv/events.cpp b/backends/platform/samsungtv/events.cpp
index ef263a0cc83..af39e67fe5e 100644
--- a/backends/platform/samsungtv/events.cpp
+++ b/backends/platform/samsungtv/events.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/events.cpp $
- * $Id: events.cpp 43636 2009-08-22 12:35:49Z sev $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp
index b64d2acb4a0..a6b8376912f 100644
--- a/backends/platform/samsungtv/main.cpp
+++ b/backends/platform/samsungtv/main.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/main.cpp $
- * $Id: main.cpp 43636 2009-08-22 12:35:49Z sev $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index f330b6ee78a..4f0f3a1e3e9 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.cpp $
- * $Id: sdl.cpp 44793 2009-10-08 19:41:38Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/samsungtv/samsungtv.h b/backends/platform/samsungtv/samsungtv.h
index 6919d7af789..b3344385aa7 100644
--- a/backends/platform/samsungtv/samsungtv.h
+++ b/backends/platform/samsungtv/samsungtv.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.h $
- * $Id: sdl.h 44793 2009-10-08 19:41:38Z fingolfin $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/platform/symbian/res/scummvm_A0000658.rss b/backends/platform/symbian/res/scummvm_A0000658.rss
index f56afbd2ac2..0bb5dff0588 100644
--- a/backends/platform/symbian/res/scummvm_A0000658.rss
+++ b/backends/platform/symbian/res/scummvm_A0000658.rss
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/symbian/res/scummvm.rss $
- * $Id: $
+ * $URL$
+ * $Id$
  */
 
 // ScummVM.RSS
diff --git a/configure b/configure
index c4a5c6d79c7..bc086552763 100755
--- a/configure
+++ b/configure
@@ -20,7 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/base/main.cpp $
+# $URL$
 # $Id$
 
 # Save the current environment variables for next runs
diff --git a/ports.mk b/ports.mk
index 699999c3c9a..aff3a6b115f 100644
--- a/ports.mk
+++ b/ports.mk
@@ -1,8 +1,8 @@
 # This file contains port specific Makefile rules. It is automatically
 # included by the default (main) Makefile.
 #
-# $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/trunk/Makefile $
-# $Id: Makefile 30664 2008-01-27 19:47:41Z jvprat $
+# $URL$
+# $Id$
 
 
 #
diff --git a/tools/create_lure/module.mk b/tools/create_lure/module.mk
index c5ab6dfef85..04229b93775 100644
--- a/tools/create_lure/module.mk
+++ b/tools/create_lure/module.mk
@@ -1,5 +1,5 @@
-# $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/trunk/Makefile $
-# $Id: Makefile 30664 2008-01-27 19:47:41Z jvprat $
+# $URL$
+# $Id$
 
 MODULE := tools/create_lure
 
diff --git a/tools/qtable/module.mk b/tools/qtable/module.mk
index dc01000a4d7..43225040c8e 100644
--- a/tools/qtable/module.mk
+++ b/tools/qtable/module.mk
@@ -1,5 +1,5 @@
-# $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/trunk/Makefile $
-# $Id: Makefile 30664 2008-01-27 19:47:41Z jvprat $
+# $URL$
+# $Id$
 
 MODULE := tools/qtable
 
diff --git a/tools/skycpt/module.mk b/tools/skycpt/module.mk
index c892cd8c35d..8ce208210bf 100644
--- a/tools/skycpt/module.mk
+++ b/tools/skycpt/module.mk
@@ -1,5 +1,5 @@
-# $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/trunk/Makefile $
-# $Id: Makefile 30664 2008-01-27 19:47:41Z jvprat $
+# $URL$
+# $Id$
 
 MODULE := tools/skycpt