diff --git a/INSTALL.txt b/INSTALL.txt
index 8de88028c7ebd2cc73aa908a3b7290ef9fb9f83a..b810f6bc94c7e4e0666a01195f1355ed22adf1af 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,6 +1,5 @@
 *******************************************************************************
 INSTALLING TYPO3
-$Id$
 *******************************************************************************
 
 This document is a part of the TYPO3 project. TYPO3 is an open source web
diff --git a/NEWS.txt b/NEWS.txt
index e6bbfe18b56be22ce18439da9bb91bbd4ef1d911..147870fc90713a40253fad989d5424ff80d8df5d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,7 +1,3 @@
-*******************************************************************************
-$Id$
-*******************************************************************************
-
 This document is a part of the TYPO3 project. TYPO3 is an open source web
 content management system released under the GNU GPL. TYPO3 is copyright
 (c) 1999-2011 by Kasper Skaarhoj.
@@ -98,7 +94,7 @@ team.
   setups.
 * The default "draft workspace" is now obsolete and will be migrated to a real
   workspace by an Upgrade Wizard.
-* Inline Relational Record Editing (IRRE) finally works in Workspaces. 
+* Inline Relational Record Editing (IRRE) finally works in Workspaces.
 * There is a new Scheduler task for the automatic publication of workspaces.
   This replaces the non-working CLI script "typo3/mod/user/ws/cli/ws_cli.phpsh"
   (which was removed).
@@ -310,7 +306,7 @@ allows settings for example like this:
  mod.SHARED.colPos_list = 0
  [page|layout = 1]
  mod.SHARED.colPos_list = 1,0
- [global] 
+ [global]
 
 -------------------------------------------------------------------------------
 Skin / Backend UI
@@ -565,18 +561,18 @@ using alt_doc.php, tce_db.php or tce_file.php need to provide a token in the
 URL or the form. This can be done by using the following code:
 
 *alt_doc.php*
- t3lib_TCEforms::getHiddenTokenField('editRecord'); 
- // or 
+ t3lib_TCEforms::getHiddenTokenField('editRecord');
+ // or
  t3lib_BEfunc::getUrlToken('editRecord');
 
 *tce_db.php*
- t3lib_TCEforms::getHiddenTokenField('tceAction'); 
- // or 
+ t3lib_TCEforms::getHiddenTokenField('tceAction');
+ // or
  t3lib_BEfunc::getUrlToken('tceAction');
 
 *tce_file.php*
- t3lib_TCEforms::getHiddenTokenField('tceFileAction'); 
- // or 
+ t3lib_TCEforms::getHiddenTokenField('tceFileAction');
+ // or
  t3lib_BEfunc::getUrlToken('tceFileAction');
 
 A new task (scheduler) for bulk update of passwords for use with
diff --git a/index.php b/index.php
index ee3b66ac1da124c1a5b841ece8802a8748acbb17..8027c0dcf17f540fd904d33b17bfb9eb68fb18cc 100644
--- a/index.php
+++ b/index.php
@@ -28,8 +28,6 @@
  * This is the MAIN DOCUMENT of the TypoScript driven standard front-end (from the "cms" extension)
  * Basically this is the "index.php" script which all requests for TYPO3 delivered pages goes to in the frontend (the website)
  *
- * $Id$
- *
  * @author	René Fritz <r.fritz@colorcube.de>
  * @package TYPO3
  * @subpackage tslib
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
index 6b4557761267afa8d5dda1a935c1d8f3587bf4ca..7663835c83932614552eacf992982a9eaa81cef4 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
@@ -31,7 +31,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 abstract class t3lib_cache_backend_AbstractBackend implements t3lib_cache_backend_Backend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
index 185215eb24aee32b909d6f9760a6b1108cb8d25a..357fe2918ea079e3631a87f35f35a10d1036ca87 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
@@ -48,7 +48,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_ApcBackend extends t3lib_cache_backend_AbstractBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
index 37138e1d9b2b94e52a762c8823504190d6788588..7d3234febc4bbe4f679507de008ebb3df6a6ff4d 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
@@ -29,7 +29,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_DbBackend extends t3lib_cache_backend_AbstractBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
index f96ece6a2385baea8fccfdf37c4fec0a518bb9c2..58c17ea0ec3a376f025e427f32ad01a267d1342a 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
@@ -31,7 +31,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_FileBackend extends t3lib_cache_backend_AbstractBackend implements t3lib_cache_backend_PhpCapableBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
index fec187a8dd488fd05bcb2d16e5f8340606850ac4..d3b0bbd9485d1f353974b05a1138359ac1b9c6b0 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
@@ -51,7 +51,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_MemcachedBackend extends t3lib_cache_backend_AbstractBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
index c04faf32cdb6ad2dcad4479f34b3ecb6efa99ce4..91381c1a5982963a01c53af3c81d00173c3acac7 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
@@ -31,7 +31,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_NullBackend extends t3lib_cache_backend_AbstractBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
index b6c32bea7fbfaa78da983fc6f54195012926a0db..d576af704303812d2e834b93e014db5e626f715a 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
@@ -30,7 +30,6 @@
  * @api
  * @scope prototype
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @version $Id$
  */
 class t3lib_cache_backend_PdoBackend extends t3lib_cache_backend_AbstractBackend {
 
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
index 04ab9cf5f6cae4cb5ea74733197e34c12ea4cb34..35e6084356983871a244d4aa84400fad885b9ed8 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
@@ -31,7 +31,6 @@
  * @package TYPO3
  * @subpackage t3lib_cache
  * @api
- * @version $Id$
  */
 class t3lib_cache_backend_TransientMemoryBackend extends t3lib_cache_backend_AbstractBackend {