diff --git a/LICENSE b/LICENSE
index 7115b67b4..be4c168f3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,3 @@
-$Id$
-
 Copyright (c) 2010 .SE, The Internet Infrastructure Foundation
                    http://www.iis.se
 
diff --git a/Makefile.am b/Makefile.am
index 00c19aa0d..d7c8127bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES = \
diff --git a/NEWS b/NEWS
index 28479a901..e013b608a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,3 @@
-$Id$
-
 NEWS for SoftHSM -- History of user visible changes
 
 SoftHSM 2.0.0a - 2010-XX-XX
diff --git a/autogen.sh b/autogen.sh
index 9945c9cef..01db361f2 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-#
-# $Id$ 
 
 autoreconf --install --force
diff --git a/configure.ac b/configure.ac
index 93d5ade25..7c73141fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl
-
 ##################
 #                #
 #    Version     #
diff --git a/src/Makefile.am b/src/Makefile.am
index 12ed93db9..afd16d2bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 SUBDIRS = bin lib