diff --git a/program/include/html.php b/program/include/html.php
index 9383b619b..99132a1aa 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id$
 
  */
 
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index 9e970f213..b691ee8d5 100644
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index e30b625d3..a4f3699d8 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 6a197036b..36b56e076 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index afd900c45..399de1efe 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -16,7 +16,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 68a5bb317..fac7db5a2 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 6a26df8e4..3a8ae524c 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index b1c1fbbbe..03c04dd63 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id$
 
 */
 
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index f574eed14..dde14c541 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -14,7 +14,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id$
 
 */