diff --git a/browse_foreigners.php b/browse_foreigners.php
index 714d8676d..0f39cb4fe 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -3,7 +3,6 @@
 /**
  * display selection for relational field values
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php
index b8fea6b55..8ad8d1abc 100644
--- a/bs_change_mime_type.php
+++ b/bs_change_mime_type.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
-     * @version     1.0
      * @package     BLOBStreaming
      */
 
diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php
index a83dfa66e..9b26a59ac 100644
--- a/bs_disp_as_mime_type.php
+++ b/bs_disp_as_mime_type.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version     1.0
  * @package     BLOBStreaming
  */
 
diff --git a/bs_play_media.php b/bs_play_media.php
index 94ed25a2b..ad3c9af51 100644
--- a/bs_play_media.php
+++ b/bs_play_media.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
-     * @version     1.0
      * @package     BLOBStreaming
      */
 
diff --git a/changelog.php b/changelog.php
index dcdbecf5d..9ab2e399a 100644
--- a/changelog.php
+++ b/changelog.php
@@ -3,7 +3,6 @@
 /**
  * Simple script to set correct charset for changelog
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/chk_rel.php b/chk_rel.php
index f95d45bda..38ca5c1b0 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_create.php b/db_create.php
index b55e04fad..9b1959a54 100644
--- a/db_create.php
+++ b/db_create.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_datadict.php b/db_datadict.php
index 7af533c94..6a9c04c5e 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_export.php b/db_export.php
index 718a489d8..dce374a4b 100644
--- a/db_export.php
+++ b/db_export.php
@@ -3,7 +3,6 @@
 /**
  * dumps a database
  *
- * @version $Id$
  * @uses    libraries/db_common.inc.php
  * @uses    libraries/db_info.inc.php
  * @uses    libraries/display_export.lib.php
diff --git a/db_import.php b/db_import.php
index bdcd5d698..73ba817fa 100644
--- a/db_import.php
+++ b/db_import.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_operations.php b/db_operations.php
index 40ec65272..e4e6992e7 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -9,7 +9,6 @@
  *  - adding tables
  *  - viewing PDF schemas
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_printview.php b/db_printview.php
index a6d66f7b5..15801a904 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_qbe.php b/db_qbe.php
index 0b661c95f..7a08f07bc 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -3,7 +3,6 @@
 /**
  * query by example the whole database
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_search.php b/db_search.php
index 03e146fdc..6fd947de8 100644
--- a/db_search.php
+++ b/db_search.php
@@ -46,7 +46,6 @@
  * @uses    array_intersect()
  * @uses    sprintf()
  * @uses    in_array()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_sql.php b/db_sql.php
index 2ac198bda..27194b08d 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_structure.php b/db_structure.php
index e99cfa308..9a6ee24ec 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/db_tracking.php b/db_tracking.php
index 68faafec3..f18b9b821 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/error.php b/error.php
index 674d08e0f..040da492d 100644
--- a/error.php
+++ b/error.php
@@ -3,7 +3,6 @@
 /**
  * phpMyAdmin fatal error display page
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/export.php b/export.php
index 9c1be559d..43c37cead 100644
--- a/export.php
+++ b/export.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @todo    too much die here, or?
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/import.php b/import.php
index 85616a9aa..b12306419 100644
--- a/import.php
+++ b/import.php
@@ -4,7 +4,6 @@
  * Core script for import, this is just the glue around all other stuff
  *
  * @uses    PMA_Bookmark_getList()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/import_status.php b/import_status.php
index 4125eadea..d739009ee 100644
--- a/import_status.php
+++ b/import_status.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/index.php b/index.php
index 0b4a98274..1aec4109f 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,6 @@
 /**
  * forms frameset
  *
- * @version $Id$
  * @uses    __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.')
  * @uses    $GLOBALS['cfg']['QueryHistoryDB']
  * @uses    $GLOBALS['cfg']['Server']['user']
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 28994c2b1..5a31629c2 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -3,7 +3,6 @@
 /**
  *
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 849287e43..b063995be 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Error
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index fab7a3986..0b9089833 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Error_Handler
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/File.class.php b/libraries/File.class.php
index 9dfe5687b..2f0fecd8a 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -3,7 +3,6 @@
 /**
  * file upload functions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 66a2114ba..61d12113e 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -3,7 +3,6 @@
 /**
  * holds the database index class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/List.class.php b/libraries/List.class.php
index 029b6fc3d..65ac7fc5a 100644
--- a/libraries/List.class.php
+++ b/libraries/List.class.php
@@ -3,7 +3,6 @@
 /**
  * hold the PMA_List base class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index 397a6db32..f793ed424 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -3,7 +3,6 @@
 /**
  * holds the PMA_List_Database class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index ffddb87e0..68d32bcfc 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -3,7 +3,6 @@
 /**
  * Holds class PMA_Message
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
index cd696338a..c2b14a4e3 100644
--- a/libraries/Partition.class.php
+++ b/libraries/Partition.class.php
@@ -3,7 +3,6 @@
 /**
  * Library for extracting information about the partitions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index 711f709e1..d0f697472 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -3,7 +3,6 @@
 /**
  * Library for extracting information about the available storage engines
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index ef522f967..7839107e8 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index cf8f0a5b4..c74ec7b8e 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -3,7 +3,6 @@
 /**
  * hold PMA_Theme class
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 9adb7c54c..c5298f378 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index e909e76b8..82deb43fe 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 71e9a62cd..e16d1894f 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -4,7 +4,6 @@
  * Set of functions used to run config authentication (ie no authentication).
  *
  * @package phpMyAdmin-Auth-Config
- * @version $Id$
  */
 
 
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index d524e1cb1..833703c0b 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -4,7 +4,6 @@
  * Set of functions used to run cookie based authentication.
  *
  * @package phpMyAdmin-Auth-Cookie
- * @version $Id$
  */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index 7ccea39e3..b3d305a10 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -5,7 +5,6 @@
  * NOTE: Requires PHP loaded as a Apache module.
  *
  * @package phpMyAdmin-Auth-HTTP
- * @version $Id$
  */
 
 
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index 2f828bda8..4215408af 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -4,7 +4,6 @@
  * Set of functions used to run single signon authentication.
  *
  * @package phpMyAdmin-Auth-Signon
- * @version $Id$
  */
 
 
diff --git a/libraries/blowfish.php b/libraries/blowfish.php
index 1dc3dcda0..ae85f4335 100644
--- a/libraries/blowfish.php
+++ b/libraries/blowfish.php
@@ -11,7 +11,6 @@
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
- * @version $Id$
  * @since   Horde 2.2
  * @package horde.cipher
  */
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 73a9665b9..fa6b4bfcd 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -3,7 +3,6 @@
 /**
  * Set of functions used with the bookmark feature
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 0b03c7ee3..9acd1843a 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -3,7 +3,6 @@
 /**
  * Charset conversion functions.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 398101bf6..6dbc251e4 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -3,7 +3,6 @@
 /**
  * Get user's global privileges and some db-specific privileges
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index 2bd1ef88c..b77fd315e 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -3,7 +3,6 @@
 /**
  * Functions for cleanup of user input.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8ad8a2c4f..abbd66372 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -28,7 +28,6 @@
  * - db connection
  * - authentication work
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6591715ec..26114015f 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3,7 +3,6 @@
 /**
  * Misc functions used all over the scripts.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index e16216c17..bb4e80571 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -16,7 +16,6 @@
  *
  * All directives are explained in Documentation.html
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index acc98145f..a4746e2a5 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -5,7 +5,6 @@
  * This script is distinct from libraries/common.inc.php because this
  * script is called from /test.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index de65d12b8..2f24e4fb7 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -3,7 +3,6 @@
 /**
  * Common Option Constants For DBI Functions
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 5d1699546..b9a4a97d4 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php
index 33c5d1798..a72c7eb24 100644
--- a/libraries/db_events.inc.php
+++ b/libraries/db_events.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 20dff36ba..2d5652b4a 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -31,7 +31,6 @@
  * @uses    strnatcasecmp()
  * @uses    count()
  * @uses    addslashes()
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 1010eac93..a86bcf559 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 5235ab518..8af21970a 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -12,7 +12,6 @@
  *       our current sql.php.
  *       Of course the interface would need a way to pass calling parameters.
  *       Also, support DEFINER (like we do in export).
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
index 2b6f42034..c938ce071 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index d1ae16a34..1110dc52d 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -4,7 +4,6 @@
  * Ensure the database and the table exist (else move to the "parent" script)
  * and display headers
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
index 07732dfd6..5f3618584 100644
--- a/libraries/dbg/setup.php
+++ b/libraries/dbg/setup.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-DBG
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 360f1db2b..c9442edea 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -4,7 +4,6 @@
  * Interface to the classic MySQL extension
  *
  * @package phpMyAdmin-DBI-MySQL
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 80779d87b..3a5a44912 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -4,7 +4,6 @@
  * Interface to the improved MySQL extension (MySQLi)
  *
  * @package phpMyAdmin-DBI-MySQLi
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 1e88a4a41..43a61f6ef 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -3,7 +3,6 @@
 /**
  * Displays form for password change
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 1f0f1f5de..f348f3ca7 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -3,7 +3,6 @@
 /**
  * Displays form for creating database (if user has privileges for that)
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index 8f1b740a6..57a5606f5 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -22,7 +22,6 @@
  * warnings about the lack of privileges for CREATE TABLE. Tested
  * on MySQL 5.0.18.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 895f30c17..ae099e034 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index c05cd4dc9..1a3f9db1c 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @version $Id$
 * @package phpMyAdmin
 */
 
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index b11df0dc7..493939bba 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -3,7 +3,6 @@
 /**
  * Code for displaying language selection
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5238d937f..682ff4c6e 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -3,7 +3,6 @@
 /**
  * library for displaying table with results from all sort of select queries
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index 40a3fd153..442d53fb7 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -7,7 +7,6 @@
  * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
  * - also changes made in js/functions.js
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
index b9d444648..2325d15a6 100644
--- a/libraries/engines/bdb.lib.php
+++ b/libraries/engines/bdb.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
index ec8e68901..48b2ae889 100644
--- a/libraries/engines/berkeleydb.lib.php
+++ b/libraries/engines/berkeleydb.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
index ef433f6b3..07eff4803 100644
--- a/libraries/engines/binlog.lib.php
+++ b/libraries/engines/binlog.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
index 8e55768e9..e1262b9c9 100644
--- a/libraries/engines/innobase.lib.php
+++ b/libraries/engines/innobase.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index d71d5a0ef..be76a40cd 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
index a1c3042ee..636a8df75 100644
--- a/libraries/engines/memory.lib.php
+++ b/libraries/engines/memory.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
index ebaf97a43..9c9ef1e2b 100644
--- a/libraries/engines/merge.lib.php
+++ b/libraries/engines/merge.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
index 4ec36d15b..fd25178ba 100644
--- a/libraries/engines/mrg_myisam.lib.php
+++ b/libraries/engines/mrg_myisam.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
index 73a4b0fd1..f6ca06129 100644
--- a/libraries/engines/myisam.lib.php
+++ b/libraries/engines/myisam.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php
index 3dfa54aaf..29793852a 100644
--- a/libraries/engines/ndbcluster.lib.php
+++ b/libraries/engines/ndbcluster.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index 125ef4fa9..842f8ff7e 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Engines
  */
 
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index 506240c04..e0898934e 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -4,7 +4,6 @@
  * Set of functions used to build NHibernate dumps of tables
  *
  * @package phpMyAdmin-Export-Codegen
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 8e1973fea..b4d081032 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Export-CSV
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index 768fa3d30..9e01fedb2 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -4,7 +4,6 @@
  * Set of functions used to build CSV dumps of tables
  *
  * @package phpMyAdmin-Export-CSV
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 5f36dc95a..ffaf5f272 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -4,7 +4,6 @@
  * Set of functions used to build CSV dumps of tables
  *
  * @package phpMyAdmin-Export-HTMLWord
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index cba335abc..ccf87e96e 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -4,7 +4,6 @@
  * Set of functions used to build dumps of tables
  *
  * @package phpMyAdmin-Export-Latex
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 78fd6f235..0cd3cdce8 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -4,7 +4,6 @@
  * Set of functions used to build OpenDocument Spreadsheet dumps of tables
  *
  * @package phpMyAdmin-Export-ODS
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 157fc43d6..408c54efe 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -4,7 +4,6 @@
  * Set of functions used to build OpenDocument Text dumps of tables
  *
  * @package phpMyAdmin-Export-ODT
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index c4111e2fe..5bd4617a2 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -4,7 +4,6 @@
  * Produce a PDF report (export) from a query
  *
  * @package phpMyAdmin-Export-PDF
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index d5c6c84e4..e0a69b87d 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -4,7 +4,6 @@
  * Set of functions used to build SQL dumps of tables
  *
  * @package phpMyAdmin-Export-SQL
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index d23890322..cc291380a 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -4,7 +4,6 @@
  *
  *
  * @package phpMyAdmin-Export-XLS
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index b59c78cc8..f3cc84902 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -4,7 +4,6 @@
  *
  *
  * @package phpMyAdmin-Export-XLSX
- * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index be005bfa7..470aaeb08 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -4,7 +4,6 @@
  * Set of functions used to build XML dumps of tables
  *
  * @todo    
- * @version $Id$
  * @package phpMyAdmin-Export-XML
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 70912725b..c44499805 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -3,7 +3,6 @@
 /**
  * Set of functions used to build YAML dumps of tables
  *
- * @version $Id$
  * @package phpMyAdmin-Export-YAML
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/file_listing.php b/libraries/file_listing.php
index ff9e1a8c8..1ca97112b 100644
--- a/libraries/file_listing.php
+++ b/libraries/file_listing.php
@@ -4,7 +4,6 @@
  * Functions for listing directories
  *
  * @todo rename to file_listing.lib.php
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 2a3cb28f2..b117779dd 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -41,7 +41,6 @@
  * @uses    PMA_generate_common_url()
  * @uses    basename()
  * @uses    file_exists()
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index a582e82dc..cddaca209 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -6,7 +6,6 @@
  * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and
  * $HTTP_AUTHORIZATION.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 8273d5022..9182f1539 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index 46f8017be..6086f38c6 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 02c0aa16f..55e799131 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index bd575d415..4a30f2b81 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index cb366b5e7..34633090d 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php
index 6fadfeb0e..2efd6158c 100644
--- a/libraries/iconv_wrapper.lib.php
+++ b/libraries/iconv_wrapper.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 85d68701c..8ef38f655 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -3,7 +3,6 @@
 /**
  * Library that provides common import functions that are used by import plugins
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index 170fb96bb..d444950cb 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -4,7 +4,6 @@
  * CSV import plugin for phpMyAdmin
  *
  * @todo    add an option for handling NULL values
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index fa458ac30..7f93f9b78 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -3,7 +3,6 @@
 /**
  * DocSQL import plugin for phpMyAdmin
  *
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 2c8702af3..adf42c1b9 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -3,7 +3,6 @@
 /**
  * CSV import plugin for phpMyAdmin
  *
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 0241d71a2..e6e7725e6 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -3,7 +3,6 @@
 /**
  * SQL import plugin for phpMyAdmin
  *
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php
index 6b50aeb2a..79d435baf 100644
--- a/libraries/import/upload/apc.php
+++ b/libraries/import/upload/apc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @version $Id$
 * @package phpMyAdmin
 */
 
diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php
index b3baf70e1..6cce9ada5 100644
--- a/libraries/import/upload/noplugin.php
+++ b/libraries/import/upload/noplugin.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @version $Id$
 * @package phpMyAdmin
 */
 
diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php
index ce4c4769d..cc7eb271d 100644
--- a/libraries/import/upload/uploadprogress.php
+++ b/libraries/import/upload/uploadprogress.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @version $Id$
 * @package phpMyAdmin
 */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/xls.php b/libraries/import/xls.php
index ca4778f31..e6ac76ffe 100644
--- a/libraries/import/xls.php
+++ b/libraries/import/xls.php
@@ -4,7 +4,6 @@
  * Microsoft Office Excel 97-2003 XLS import plugin for phpMyAdmin
  *
  * @todo    Pretty much everything
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 
diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php
index 80d79e58f..00cadde35 100644
--- a/libraries/import/xlsx.php
+++ b/libraries/import/xlsx.php
@@ -4,7 +4,6 @@
  * Microsoft Office Excel 2007 XLSX import plugin for phpMyAdmin
  *
  * @todo    Pretty much everything
- * @version $Id$
  * @package phpMyAdmin-Import
  */
 
diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php
index 670cd310f..5c7d0e118 100644
--- a/libraries/information_schema_relations.lib.php
+++ b/libraries/information_schema_relations.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index 6403528ac..69cab18e7 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -4,7 +4,6 @@
  * This library is used with the server IP allow/deny host authentication
  * feature
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index 8bec9c0ef..5ddb60460 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -5,7 +5,6 @@
  *
  * @package phpMyAdmin
  *
- * @version $Id$
  */
 
 /**
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
index e1590a312..74e7698f4 100644
--- a/libraries/kanji-encoding.lib.php
+++ b/libraries/kanji-encoding.lib.php
@@ -9,7 +9,6 @@
  *
  * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp>
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php
index a52098f16..87642472f 100644
--- a/libraries/logging.lib.php
+++ b/libraries/logging.lib.php
@@ -5,7 +5,6 @@
  *
  * This includes web server specific code to log some information.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php
index 6ee5249a9..b8d035a7b 100644
--- a/libraries/mime.lib.php
+++ b/libraries/mime.lib.php
@@ -3,7 +3,6 @@
 /**
  * MIME detection code.
  *
- * @version $Id$
  * @package phpMyAdmin
  * @todo Maybe we could try to use fileinfo module if loaded
  */
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index c50894188..0b3413b39 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 1782a3e6c..303c63770 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 969d86ad8..d6cb38325 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -3,7 +3,6 @@
 /**
  * displays the pma logo, links and db and server selection in left frame
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php
index 22903247e..780ee0274 100644
--- a/libraries/ob.lib.php
+++ b/libraries/ob.lib.php
@@ -9,7 +9,6 @@
  * Check for all the needed functions for output buffering
  * Make some wrappers for the top and bottoms of our files.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index b81d7594c..810d97f5e 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -3,7 +3,6 @@
 /**
  * Simple interface for creating OASIS OpenDocument files.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php
index 75dd00b21..345c0964c 100644
--- a/libraries/parse_analyze.lib.php
+++ b/libraries/parse_analyze.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index b78d32f80..da52b83d7 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -3,7 +3,6 @@
 /**
  * Generic plugin interface.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 6aefe89d2..36f02b086 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -3,7 +3,6 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index 6c2c7895c..313e0b22e 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -3,7 +3,6 @@
 /**
  * Set of functions used for cleaning up phpMyAdmin tables
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 7b8ca0afb..3669a4ebd 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index a975bee72..d64e5f417 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 2b54bf197..c9b79a747 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -3,7 +3,6 @@
 /**
  * This is in a separate script because it's called from a number of scripts
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index f4c0c1bab..f750d810f 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -3,7 +3,6 @@
 /**
  * phpMyAdmin Language Loading File
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index f873a5ed3..602b63cfc 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -3,7 +3,6 @@
 /**
  * Code for displaying server selection
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 89e468bf6..56ab26189 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -7,7 +7,6 @@
  * @uses    PMA_DBI_fetch_result()
  * @uses    PMA_DBI_QUERY_STORE
  * @uses    $userlink
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 1608de3e7..c5d384f9f 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 8f5bec9d0..551668d9f 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -3,7 +3,6 @@
 /**
  * session handling
  *
- * @version $Id$
  * @todo    add failover or warn if sessions are not configured properly
  * @todo    add an option to use mm-module for session handler
  * @see     http://www.php.net/session
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 30f02f64d..a29f227c4 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -3,7 +3,6 @@
 /**
  * functions for displaying the sql query form
  *
- * @version $Id$
  * @usedby  server_sql.php
  * @usedby  db_sql.php
  * @usedby  tbl_sql.php
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index b68d193a4..8af645874 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -19,7 +19,6 @@
  * It's easier to use only uppercase for proper sorting. In case of
  * doubt, use the DEBUG code after this function's definition.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index bb103aa50..5509db1c9 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -24,7 +24,6 @@
  * page for it to work, I recommend '<link rel="stylesheet" type="text/css"
  * href="syntax.css.php" />' at the moment.)
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index 52dd994eb..2e965f851 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -27,7 +27,6 @@
  *
  * Also set a username and password if you have a private one
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index d87dbf7f3..e17a935b9 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -12,7 +12,6 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id$
  * @uses    extension_loaded()
  * @uses    substr()
  * @uses    function_exists()
diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
index eac8a94ea..69b5a0d3c 100644
--- a/libraries/string_mb.lib.php
+++ b/libraries/string_mb.lib.php
@@ -12,7 +12,6 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id$
  * @package phpMyAdmin-String-MB
  */
 
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
index 8a5b8cc78..e70bf0b01 100644
--- a/libraries/string_native.lib.php
+++ b/libraries/string_native.lib.php
@@ -12,7 +12,6 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id$
  * @package phpMyAdmin-String-Native
  */
 
diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php
index 4e7a10674..b211dd59c 100644
--- a/libraries/string_type_ctype.lib.php
+++ b/libraries/string_type_ctype.lib.php
@@ -12,7 +12,6 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id$
  * @package phpMyAdmin-StringType-CType
  */
 
diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php
index 337c23df7..a2c7f0e20 100644
--- a/libraries/string_type_native.lib.php
+++ b/libraries/string_type_native.lib.php
@@ -12,7 +12,6 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id$
  * @package phpMyAdmin-StringType-Native
  */
 
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
index 0ef16c22b..41d81523b 100644
--- a/libraries/tbl_common.php
+++ b/libraries/tbl_common.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index c1adea476..e97c2fb7d 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -6,7 +6,6 @@
  * @todo should be handled by class Table
  * @todo this should be recoded as functions, to avoid messing with global variables
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index e9b4cb939..1f695a529 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 0d00d17ec..4b10f513d 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -4,7 +4,6 @@
  * Display form for changing/adding table fields/columns
  *
  * included by tbl_addfield.php, -_alter.php, -_create.php
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index 08bbdb7fd..824d5bc06 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -17,7 +17,6 @@
  *
  * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES
  *
- * @version $Id$
  *
  * @uses $_REQUEST
  * @uses defined()
diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php
index d397b3c2e..da2ee1dcb 100644
--- a/libraries/tbl_triggers.lib.php
+++ b/libraries/tbl_triggers.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
index c3249f18e..7148003b5 100644
--- a/libraries/transformations.lib.php
+++ b/libraries/transformations.lib.php
@@ -3,7 +3,6 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php
index 4fbc24dd3..28b199a67 100644
--- a/libraries/transformations/application_octetstream__download.inc.php
+++ b/libraries/transformations/application_octetstream__download.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_application_octetstream__download_info() {
diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php
index 712235498..f5050ce48 100644
--- a/libraries/transformations/application_octetstream__hex.inc.php
+++ b/libraries/transformations/application_octetstream__hex.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_application_octetstream__hex_info() {
diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php
index 1e662ee6d..974f24fac 100644
--- a/libraries/transformations/global.inc.php
+++ b/libraries/transformations/global.inc.php
@@ -19,7 +19,6 @@
  *
  * Please provide a comment for your function, what it does and what parameters are available.
  *
- * @version $Id$
  * @package phpMyAdmin-Transformation
  */
 
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
index 682e4a0bb..d4312aaf5 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_image_jpeg__inline_info() {
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
index 5223e506b..0d0b9a393 100644
--- a/libraries/transformations/image_jpeg__link.inc.php
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_image_jpeg__link_info() {
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
index f631aa4a1..3655171f5 100644
--- a/libraries/transformations/image_png__inline.inc.php
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_image_png__inline_info() {
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
index cf3c2b02f..42a19a96d 100644
--- a/libraries/transformations/text_plain__dateformat.inc.php
+++ b/libraries/transformations/text_plain__dateformat.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__dateformat_info() {
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index 8c35a4eb9..2ed3cdd13 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__external_info() {
diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php
index add22e148..f251f29aa 100644
--- a/libraries/transformations/text_plain__formatted.inc.php
+++ b/libraries/transformations/text_plain__formatted.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__formatted_info() {
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
index cb62067ec..b22c945f1 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__imagelink_info() {
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
index 579deda78..bec766195 100644
--- a/libraries/transformations/text_plain__link.inc.php
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__link_info() {
diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php
index bcfc12a4a..a6d31aad4 100644
--- a/libraries/transformations/text_plain__longToIpv4.inc.php
+++ b/libraries/transformations/text_plain__longToIpv4.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__longToIpv4_info() {
diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php
index 5d5bfb1e5..afc288862 100644
--- a/libraries/transformations/text_plain__sql.inc.php
+++ b/libraries/transformations/text_plain__sql.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__sql_info() {
diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php
index 9982dcba4..67d45365b 100644
--- a/libraries/transformations/text_plain__substr.inc.php
+++ b/libraries/transformations/text_plain__substr.inc.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @package phpMyAdmin-Transformation
- * @version $Id$
  */
 
 function PMA_transformation_text_plain__substr_info() {
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index ef5c7fa2a..069e4b439 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -3,7 +3,6 @@
 /**
  * URL/hidden inputs generating.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
index 35b6dea37..5cea60964 100644
--- a/libraries/vendor_config.php
+++ b/libraries/vendor_config.php
@@ -7,7 +7,6 @@
  * For changing this file you should know what you are doing. For this reason
  * options here are not part of normal configuration.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
index f616c7d04..c6ac6e509 100644
--- a/libraries/zip.lib.php
+++ b/libraries/zip.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/license.php b/license.php
index 029461129..b4b394f57 100644
--- a/license.php
+++ b/license.php
@@ -6,7 +6,6 @@
  * Note: please do not fold this script into a general script
  * that would read any file using a GET parameter, it would open a hole
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/main.php b/main.php
index 360e98881..ba6faa151 100644
--- a/main.php
+++ b/main.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/navigation.php b/navigation.php
index 909bc0054..06581cc5e 100644
--- a/navigation.php
+++ b/navigation.php
@@ -3,7 +3,6 @@
 /**
  * the navigation frame - displays server, db and table selection tree
  *
- * @version $Id$
  * @package phpMyAdmin
  * @uses $GLOBALS['pma']->databases
  * @uses $GLOBALS['server']
diff --git a/pdf_pages.php b/pdf_pages.php
index 2e907b8d5..a26420f04 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/pdf_schema.php b/pdf_schema.php
index 43bffaeec..097979209 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/phpinfo.php b/phpinfo.php
index 043db9563..777521b4a 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * phpinfo() wrapper to allow displaying only when configured to do so.
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index ebf48bb36..2275c97ff 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/pmd_common.php b/pmd_common.php
index bb376fa9d..bf2351493 100644
--- a/pmd_common.php
+++ b/pmd_common.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_display_field.php b/pmd_display_field.php
index fc4f54046..acfa162c8 100644
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_general.php b/pmd_general.php
index 89988ddfa..f87d62bee 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_help.php b/pmd_help.php
index e538a4817..2f5e006f3 100644
--- a/pmd_help.php
+++ b/pmd_help.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_pdf.php b/pmd_pdf.php
index 3c921f59c..069f6f1a9 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index 5dc8754d6..307304a21 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index eb4e17b78..a4ee7f938 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 63e19e552..7f6179ae6 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff --git a/querywindow.php b/querywindow.php
index 0d15de5f7..dd2e39b36 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -37,7 +37,6 @@
  * @uses    strlen()
  * @uses    preg_replace()
  * @uses    htmlspecialchars()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index 48ea0ca4b..2f55dcf4e 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -8,7 +8,6 @@
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
  *
- * @version $Id$
  * @package phpMyAdmin-debug
  */
 
diff --git a/scripts/signon.php b/scripts/signon.php
index a289fce9a..d2aac588a 100644
--- a/scripts/signon.php
+++ b/scripts/signon.php
@@ -7,7 +7,6 @@
  * not intended to be perfect code and look, only shows how you can
  * integrate this functionality in your application.
  *
- * @version $Id$
  * @package phpMyAdmin
  * @subpackage Example
  */
diff --git a/server_binlog.php b/server_binlog.php
index c8dd61497..71afc0801 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -35,7 +35,6 @@
  * @uses    array_key_exists()
  * @uses    implode()
  * @uses    htmlspecialchars()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_collations.php b/server_collations.php
index 0abeaab40..b6482cd84 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_databases.php b/server_databases.php
index 9a05c707d..0c7d598e5 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_engines.php b/server_engines.php
index 6fa73ec6e..f9664ca02 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -3,7 +3,6 @@
 /**
  * display list of server enignes and additonal information about them
  *
- * @version $Id$
  * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/
  * @package phpMyAdmin
  */
diff --git a/server_export.php b/server_export.php
index e728465bc..9d78ce7bf 100644
--- a/server_export.php
+++ b/server_export.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_import.php b/server_import.php
index d0ec6872f..e7a911894 100644
--- a/server_import.php
+++ b/server_import.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_privileges.php b/server_privileges.php
index ea4b8c858..a909ef588 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_processlist.php b/server_processlist.php
index a77706097..58f4813fa 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_replication.php b/server_replication.php
index dae375adb..1dbd42e3c 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_sql.php b/server_sql.php
index 54141b101..1b8027c33 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_status.php b/server_status.php
index 5ebd83591..30edca2c8 100644
--- a/server_status.php
+++ b/server_status.php
@@ -4,7 +4,6 @@
  * displays status variables with descriptions and some hints an optmizing
  *  + reset status variables
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_synchronize.php b/server_synchronize.php
index c5d807728..1272dda97 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -3,7 +3,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/server_variables.php b/server_variables.php
index 0248b8adc..db156a212 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/show_config_errors.php b/show_config_errors.php
index 8b1cd187e..9024fec22 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -3,7 +3,6 @@
 /**
  * Simple wrapper just to enable error reporting and include config
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/sql.php b/sql.php
index 288f150d4..c2b103123 100644
--- a/sql.php
+++ b/sql.php
@@ -3,7 +3,6 @@
 /**
  * @todo    we must handle the case if sql.php is called directly with a query
  *          that returns 0 rows - to prevent cyclic redirects or includes
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 500a3daee..b61327fb4 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_alter.php b/tbl_alter.php
index 92c9fedda..7f81c4179 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -6,7 +6,6 @@
  * linked from table_structure, uses libraries/tbl_properties.inc.php to display
  * form and handles this form data
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_change.php b/tbl_change.php
index 61ccadc1c..f8734904a 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -5,7 +5,6 @@
  *
  * register_globals_save (mark this file save for disabling register globals)
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_create.php b/tbl_create.php
index 02c637dff..885678866 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -31,7 +31,6 @@
  * @uses    strlen()
  * @uses    sprintf()
  * @uses    htmlspecialchars()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_export.php b/tbl_export.php
index 086dd39f7..eeaf24815 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_get_field.php b/tbl_get_field.php
index ac123572a..a58eb5117 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Provides download to a given field defined in parameters.
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_import.php b/tbl_import.php
index a0500fd07..ead8ff0e7 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 470cd04f6..172191ac3 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -3,7 +3,6 @@
 /**
  * Displays index edit/creation form and handles it
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index f4c8d478a..fa8a11e4f 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_operations.php b/tbl_operations.php
index 4e0738ab7..fa89491ee 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_printview.php b/tbl_printview.php
index 7f7a8c804..1b625f99e 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_relation.php b/tbl_relation.php
index 5ca5ed54e..ab5851177 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -10,7 +10,6 @@
  * @todo check foreign fields to be from same type and size, all other makes no sense
  * @todo add an link to create an index required for constraints, or an option to do automatically
  * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_replace.php b/tbl_replace.php
index b508342ca..d3271acb1 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -5,7 +5,6 @@
  *
  * usally called as form action from tbl_change.php to insert or update table rows
  *
- * @version $Id$
  *
  * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by
  *       it needs the original query and the row number and than replace the LIMIT clause
diff --git a/tbl_row_action.php b/tbl_row_action.php
index bfe2e43af..356ad57d9 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -3,7 +3,6 @@
 /**
  * handle row specifc actions like edit, delete, export
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_select.php b/tbl_select.php
index 99936f36e..d9e8a4662 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -7,7 +7,6 @@
  * and include sql.php to execute it
  *
  * @todo display search form again if no results from previous search
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_sql.php b/tbl_sql.php
index 5565d923b..a9366c81b 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_structure.php b/tbl_structure.php
index 8f1f26db9..b0263a39c 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -3,7 +3,6 @@
 /**
  * Displays table structure infos like fields/columns, indexes, size, rows
  * and allows manipulation of indexes and columns/fields
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 3e761f8b1..698076a14 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
index 50b27c901..5d9baedfe 100644
--- a/test/AllSeleniumTests.php
+++ b/test/AllSeleniumTests.php
@@ -3,7 +3,6 @@
 /**
  * runs all defined Selenium tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/AllTests.php b/test/AllTests.php
index 079a947a1..b77f3ecfc 100644
--- a/test/AllTests.php
+++ b/test/AllTests.php
@@ -3,7 +3,6 @@
 /**
  * runs all defined tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/Environment_test.php b/test/Environment_test.php
index 7bc16e75e..f61956f36 100644
--- a/test/Environment_test.php
+++ b/test/Environment_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for environment like OS, PHP, modules, ...
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/FailTest.php b/test/FailTest.php
index 0cecf6934..f430bb470 100644
--- a/test/FailTest.php
+++ b/test/FailTest.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_get_real_size()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php
index 009dc2361..e3a44928c 100644
--- a/test/PMA_Message_test.php
+++ b/test/PMA_Message_test.php
@@ -3,7 +3,6 @@
 /**
  * Test for PMA_Message class
  *
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php
index 957f2cb12..7900b9262 100644
--- a/test/PMA_STR_sub_test.php
+++ b/test/PMA_STR_sub_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_pow()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php
index 307d966ab..234339abc 100644
--- a/test/PMA_blowfish_test.php
+++ b/test/PMA_blowfish_test.php
@@ -4,7 +4,6 @@
  * Test for blowfish encryption.
  *
  * @package phpMyAdmin-test
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php
index 6b54cea65..4efd6337e 100644
--- a/test/PMA_escapeJsString_test.php
+++ b/test/PMA_escapeJsString_test.php
@@ -4,7 +4,6 @@
  * Test for javascript escaping.
  *
  * @package phpMyAdmin-test
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php
index 75dd4e837..ccdf15b97 100644
--- a/test/PMA_escapeMySqlWildcards_test.php
+++ b/test/PMA_escapeMySqlWildcards_test.php
@@ -4,7 +4,6 @@
  * Test for MySQL Wildcards escaping/unescaping
  *
  * @package phpMyAdmin-test
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_foreignKeySupported_test.php b/test/PMA_foreignKeySupported_test.php
index 6d3e1ab33..f00afca2c 100644
--- a/test/PMA_foreignKeySupported_test.php
+++ b/test/PMA_foreignKeySupported_test.php
@@ -4,7 +4,6 @@
  * Test for supporting foreign key
  *
  * @package phpMyAdmin-test
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php
index 8f62a82cd..22e948b6b 100644
--- a/test/PMA_generateCommonUrl_test.php
+++ b/test/PMA_generateCommonUrl_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_generate_common_url()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php
index baad230eb..14d2a61fe 100644
--- a/test/PMA_get_real_size_test.php
+++ b/test/PMA_get_real_size_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_get_real_size()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php
index 7626906d2..f37e061a1 100644
--- a/test/PMA_headerLocation_test.php
+++ b/test/PMA_headerLocation_test.php
@@ -3,7 +3,6 @@
 /**
  * Test for PMA_sendHeaderLocation
  *
- * @version $Id$
  */
 
 /**
diff --git a/test/PMA_ifSetOr_test.php b/test/PMA_ifSetOr_test.php
index 4e9dce185..fbeb80ee0 100644
--- a/test/PMA_ifSetOr_test.php
+++ b/test/PMA_ifSetOr_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_ifSetOr()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php
index fd561ff5d..ffd41a261 100644
--- a/test/PMA_isValid_test.php
+++ b/test/PMA_isValid_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_pow()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php
index e9b9441b5..cb62e528c 100644
--- a/test/PMA_pow_test.php
+++ b/test/PMA_pow_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_pow()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php
index 396daa604..1400c7ede 100644
--- a/test/PMA_sanitize_test.php
+++ b/test/PMA_sanitize_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_sanitize()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php
index b47812df5..126a6204c 100644
--- a/test/PMA_transformation_getOptions_test.php
+++ b/test/PMA_transformation_getOptions_test.php
@@ -3,7 +3,6 @@
 /**
  * tests for PMA_sanitize()
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PmaSeleniumLoginTest.php b/test/PmaSeleniumLoginTest.php
index dad0f5fd2..9c1be97b8 100644
--- a/test/PmaSeleniumLoginTest.php
+++ b/test/PmaSeleniumLoginTest.php
@@ -3,7 +3,6 @@
 /**
  * Selenium TestCase for login related tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PmaSeleniumPrivilegesTest.php b/test/PmaSeleniumPrivilegesTest.php
index 149f3ed7d..64ff25d10 100644
--- a/test/PmaSeleniumPrivilegesTest.php
+++ b/test/PmaSeleniumPrivilegesTest.php
@@ -3,7 +3,6 @@
 /**
  * Selenium TestCase for privilege related tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PmaSeleniumTestCase.php b/test/PmaSeleniumTestCase.php
index e2468b64c..ac70594d4 100644
--- a/test/PmaSeleniumTestCase.php
+++ b/test/PmaSeleniumTestCase.php
@@ -3,7 +3,6 @@
 /**
  * Selenium parent class for TestCases
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PmaSeleniumXssTest.php b/test/PmaSeleniumXssTest.php
index 0870aa435..5099506f9 100644
--- a/test/PmaSeleniumXssTest.php
+++ b/test/PmaSeleniumXssTest.php
@@ -3,7 +3,6 @@
 /**
  * Selenium TestCase for XSS related tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/theme.php b/test/theme.php
index cbd998178..098feed77 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -5,7 +5,6 @@
  *
  * @uses    libraries/common.inc.php        global fnctions
  * @package phpMyAdmin-test
- * @version $Id$
  */
 
 chdir('..');
diff --git a/test/wui.php b/test/wui.php
index d1f6f6cce..c3b459d0a 100644
--- a/test/wui.php
+++ b/test/wui.php
@@ -3,7 +3,6 @@
 /**
  * runs all defined tests
  *
- * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/themes.php b/themes.php
index e6863712c..a996030f4 100644
--- a/themes.php
+++ b/themes.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index c4b8cda00..cf5437884 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -3,7 +3,6 @@
 /**
  * main css file from theme Darkblue Orange
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php
index 57cc4568f..62f981bca 100644
--- a/themes/darkblue_orange/info.inc.php
+++ b/themes/darkblue_orange/info.inc.php
@@ -3,7 +3,6 @@
 /**
  * Theme information
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
index 50ed7bf1d..e7282e1c5 100644
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -4,7 +4,6 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index e161f5906..0fcaf2105 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -3,7 +3,6 @@
 /**
  * navigation css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php
index b39f5cf80..49a0d2363 100644
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -3,7 +3,6 @@
 /**
  * print css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b3c510154..4cd48eadf 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -3,7 +3,6 @@
 /**
  * main css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
index 0608898fe..5f7beba8f 100644
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -3,7 +3,6 @@
 /**
  * Theme information
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index 909320a36..604982aeb 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -4,7 +4,6 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff --git a/transformation_overview.php b/transformation_overview.php
index 12ca39513..acf2ca489 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index a231d49a7..3dd9c3123 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/user_password.php b/user_password.php
index 91cfde006..6cb795ab7 100644
--- a/user_password.php
+++ b/user_password.php
@@ -25,7 +25,6 @@
  * @uses    PMA_blowfish_encrypt()
  * @uses    PMA_showMessage()
  * @uses    define()
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/view_create.php b/view_create.php
index 6797919c0..a1de4cc5b 100644
--- a/view_create.php
+++ b/view_create.php
@@ -5,7 +5,6 @@
  *
  * @todo js error when view name is empty (strFormEmpty)
  * @todo (also validate if js is disabled, after form submission?)
- * @version $Id$
  * @package phpMyAdmin
  */
 
diff --git a/view_operations.php b/view_operations.php
index b707ca5d1..08c26d6e1 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */