diff --git a/configure.ac b/configure.ac
index 03fad83..27c9fce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,6 @@ dnl ###########
 
 AC_INIT([ezstream], [0.6.0],
 	[https://trac.xiph.org/newticket?component=ezstream])
-AC_REVISION([$Id$])
 AC_PREREQ([2.61])
 AC_CONFIG_SRCDIR([src/ezstream.c])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/doc/ezstream-file.sh.1.in.in b/doc/ezstream-file.sh.1.in.in
index 77e72cc..6a8ee1a 100644
--- a/doc/ezstream-file.sh.1.in.in
+++ b/doc/ezstream-file.sh.1.in.in
@@ -1,5 +1,3 @@
-.\" $Id$
-.\"
 .\" Copyright (c) 2009, 2015 Moritz Grimm <mgrimm@mrsserver.net>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
diff --git a/doc/ezstream.1.in.in b/doc/ezstream.1.in.in
index c44ec78..189bd5e 100644
--- a/doc/ezstream.1.in.in
+++ b/doc/ezstream.1.in.in
@@ -1,5 +1,3 @@
-.\" $Id$
-.\"
 .\" Copyright (c) 2007, 2009, 2015 Moritz Grimm <mgrimm@mrsserver.net>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
diff --git a/m4/ccflags.m4 b/m4/ccflags.m4
index f634d09..bf7da8a 100644
--- a/m4/ccflags.m4
+++ b/m4/ccflags.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # * Check if the compiler understands a certain flag or not.
 dnl #   Inspiration for this came from watching TagLib configure.
 dnl # * Check for the CFLAG required to turn warnings into errors.
diff --git a/m4/libshout.m4 b/m4/libshout.m4
index e5914ad..8e24d6a 100644
--- a/m4/libshout.m4
+++ b/m4/libshout.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check for a working installation of libshout.
 dnl # Provides appropriate --with configuration options, fills the
 dnl # LIBSHOUT_CFLAGS, LIBSHOUT_CPPFLAGS, LIBSHOUT_LDFLAGS and LIBSHOUT_LIBS
diff --git a/m4/libvorbis.m4 b/m4/libvorbis.m4
index 75f01e0..faad5c5 100644
--- a/m4/libvorbis.m4
+++ b/m4/libvorbis.m4
@@ -1,5 +1,3 @@
-dnl $Id$
-
 dnl # Check for working installations of libvorbis, libvorbisfile and
 dnl # libvorbisenc.
 dnl # Provides appropriate --with configuration options, fills the
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
index 0827ddb..f2bb8b4 100644
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check for a working installation of libxml (version 2.)
 dnl # Provides appropriate --with configuration options, fills the
 dnl # LIBXML2_CFLAGS, LIBXML2_CPPFLAGS, LIBXML2_LDFLAGS and LIBXML2_LIBS
diff --git a/m4/progname.m4 b/m4/progname.m4
index 92deaca..a0067dc 100644
--- a/m4/progname.m4
+++ b/m4/progname.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check whether libc defines __progname. Defines HAVE___PROGNAME, if
 dnl # applicable. This check is heavily inspired by the one in OpenNTPd
 dnl # (portable.)
diff --git a/m4/taglib.m4 b/m4/taglib.m4
index b318b3e..f083db0 100644
--- a/m4/taglib.m4
+++ b/m4/taglib.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check for working installations of TagLib and its C-wrapper library,
 dnl # libtag_c.
 dnl # Provides appropriate --with configuration options, fills the
diff --git a/m4/tree.m4 b/m4/tree.m4
index cbc02db..b21b6af 100644
--- a/m4/tree.m4
+++ b/m4/tree.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check for sys/tree.h and if it is recent enough by looking at a certain
 dnl # macro. Defines HAVE_SYS_TREE_H if all conditions are met.
 
diff --git a/m4/vacopy.m4 b/m4/vacopy.m4
index 76adf5e..ce6b428 100644
--- a/m4/vacopy.m4
+++ b/m4/vacopy.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Check for means to copy variable argument lists. After this check,
 dnl # va_copy will at least be defined to something working.
 dnl # This requires stdarg.h, which is assumed to exist.
diff --git a/m4/vars.m4 b/m4/vars.m4
index b52da27..29d19f4 100644
--- a/m4/vars.m4
+++ b/m4/vars.m4
@@ -1,5 +1,3 @@
-dnl # $Id$
-
 dnl # Append or prepend items to a variable, but keep the items in the
 dnl # variable unique.
 dnl # Re-implemented from scratch after seeing XIPH_VAR_[PRE,AP]PEND, written
diff --git a/src/compat.c b/src/compat.c
index dbb266f..a26abc5 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -1,5 +1,3 @@
-/*	$Id$	*/
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/src/configfile.c b/src/configfile.c
index 4679e22..8bafdcc 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/configfile.h b/src/configfile.h
index a52ccb0..179a281 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/ezstream.c b/src/ezstream.c
index 8811b9c..329dbc8 100644
--- a/src/ezstream.c
+++ b/src/ezstream.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/ezstream.h b/src/ezstream.h
index 6e8d3ca..47b9693 100644
--- a/src/ezstream.h
+++ b/src/ezstream.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (c) 2007, 2009 Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/getopt.c b/src/getopt.c
index cca8dfd..b90c1b7 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*	$OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
diff --git a/src/metadata.c b/src/metadata.c
index 14cbf4c..2623607 100644
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (c) 2007, 2009 Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/metadata.h b/src/metadata.h
index 75d07e6..95a5a91 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/playlist.c b/src/playlist.c
index 4a151bc..64e3810 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (c) 2007, 2009 Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/playlist.h b/src/playlist.h
index 674a5a9..8430831 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/strfctns.h b/src/strfctns.h
index 0a1eca0..83316fa 100644
--- a/src/strfctns.h
+++ b/src/strfctns.h
@@ -1,5 +1,3 @@
-/*	$Id$	*/
-
 #ifndef __STRLFCTNS_H__
 #define __STRLFCTNS_H__
 
diff --git a/src/strlcat.c b/src/strlcat.c
index edf5535..3307fb1 100644
--- a/src/strlcat.c
+++ b/src/strlcat.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
diff --git a/src/strlcpy.c b/src/strlcpy.c
index 950dd47..e7b807b 100644
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
 
 /*
diff --git a/src/strtonum.c b/src/strtonum.c
index 39ff6a8..bf17979 100644
--- a/src/strtonum.c
+++ b/src/strtonum.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
 
 /*
diff --git a/src/util.c b/src/util.c
index 9ecd430..5cf5781 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/util.h b/src/util.h
index 0db8102..a55813e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/xalloc.c b/src/xalloc.c
index 6d30959..8ea31e5 100644
--- a/src/xalloc.c
+++ b/src/xalloc.c
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * Copyright (C) 2007  Moritz Grimm <mgrimm@mrsserver.net>
  *
diff --git a/src/xalloc.h b/src/xalloc.h
index 160c3a8..014c350 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,4 +1,3 @@
-/*	$Id$	*/
 /*
  * libxalloc - Portable memory allocation wrapper library, with extensive
  *             error checking, debugging facilities and hooks for 3rd party