diff --git a/doc/Makefile b/doc/Makefile
index 55d34ae5d..a7ea171f2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,3 @@
-# $Id$
-
 SHELL = /bin/bash
 
 CONTRIBUTED_MODULES = ""
diff --git a/src/Makefile.in b/src/Makefile.in
index 246c58d71..e026f9562 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/cyrsasl_gssapi.erl b/src/cyrsasl_gssapi.erl
index 11d995587..4075d284f 100644
--- a/src/cyrsasl_gssapi.erl
+++ b/src/cyrsasl_gssapi.erl
@@ -3,7 +3,6 @@
 %%% Author  : Mikael Magnusson <mikma@users.sourceforge.net>
 %%% Purpose : GSSAPI SASL mechanism
 %%% Created : 1 June 2007 by Mikael Magnusson <mikma@users.sourceforge.net>
-%%% Id      : $Id: $
 %%%----------------------------------------------------------------------
 %%%
 %%% Copyright (C) 2007-2009  Mikael Magnusson <mikma@users.sourceforge.net>
@@ -39,7 +38,6 @@
 
 -module(cyrsasl_gssapi).
 -author('mikma@users.sourceforge.net').
--vsn('$Revision: $ ').
 
 -export([start/1,
 	 stop/0,
diff --git a/src/ejabberd.app b/src/ejabberd.app
index f78397499..68e648919 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -1,5 +1,3 @@
-%% $Id$
-
 {application, ejabberd,
  [{description, "ejabberd"},
   {vsn, "3.0.0-alpha-x"},
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 2533f4271..e4dc3aa7d 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -602,8 +602,6 @@
 %%%.
 %%%'
 
-%%% $Id$
-
 %%% Local Variables:
 %%% mode: erlang
 %%% End:
diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in
index a4c20c344..860dfe1a2 100644
--- a/src/ejabberd_zlib/Makefile.in
+++ b/src/ejabberd_zlib/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 5dd3de60f..81ccfc1eb 100644
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in 2842 2009-12-29 19:10:52Z badlop $
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/eldap/eldap.erl b/src/eldap/eldap.erl
index 9e6081687..7868f6036 100644
--- a/src/eldap/eldap.erl
+++ b/src/eldap/eldap.erl
@@ -53,7 +53,6 @@
 %%% NOTICE: STARTTLS is not supported.
 
 %%% --------------------------------------------------------------------
--vc('$Id$ ').
 
 
 %%%----------------------------------------------------------------------
diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in
index 8de962622..0bf75af6b 100644
--- a/src/mod_muc/Makefile.in
+++ b/src/mod_muc/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/mod_proxy65/Makefile.in b/src/mod_proxy65/Makefile.in
index 063cab767..d6d3fb8dd 100644
--- a/src/mod_proxy65/Makefile.in
+++ b/src/mod_proxy65/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index 335e29800..ae48704d6 100644
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in
index f5bac4ec6..bf1f5ee26 100644
--- a/src/odbc/Makefile.in
+++ b/src/odbc/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/p1_fsm.erl b/src/p1_fsm.erl
index 9ca924112..f2c3d242b 100644
--- a/src/p1_fsm.erl
+++ b/src/p1_fsm.erl
@@ -27,7 +27,6 @@
 %%   process will be terminated.
 %%   - You might customize the State data before sending it to error_logger
 %%   in case of a crash (just export the function print_state/1)
-%%     $Id$
 %%
 -module(p1_fsm).
 
diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index c343818cf..bf9aad732 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in 775 2007-05-29 14:31:12Z mremond $
-
 CC = @CC@
 CFLAGS = @CFLAGS@ @PAM_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/stun/Makefile.in b/src/stun/Makefile.in
index c7ac423cf..d6d3fb8dd 100644
--- a/src/stun/Makefile.in
+++ b/src/stun/Makefile.in
@@ -1,5 +1,3 @@
-# $Id: Makefile.in 1453 2008-07-16 16:58:42Z badlop $
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in
index 131e92b44..a87da0ea3 100644
--- a/src/tls/Makefile.in
+++ b/src/tls/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/web/Makefile.in b/src/web/Makefile.in
index 466f5e82e..161dbb25c 100644
--- a/src/web/Makefile.in
+++ b/src/web/Makefile.in
@@ -1,5 +1,3 @@
-# $Id$
-
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index 600f7a438..a9bdbdd39 100644
--- a/src/web/ejabberd_http_bind.erl
+++ b/src/web/ejabberd_http_bind.erl
@@ -5,7 +5,6 @@
 %%%           HTTP Binding)
 %%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
 %%% Modified: may 2009 by Mickael Remond, Alexey Schepin
-%%% Id      : $Id: ejabberd_http_bind.erl 953 2009-05-07 10:40:40Z alexey $
 %%%----------------------------------------------------------------------
 
 -module(ejabberd_http_bind).
diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg
index a42b849d5..fe49a25fa 100644
--- a/src/win32/ejabberd.cfg
+++ b/src/win32/ejabberd.cfg
@@ -1,4 +1,3 @@
-% $Id$
 
 %override_acls.