diff --git a/AUTHORS b/AUTHORS
index a4696973..299511db 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,2 @@
-$Id$
 
 Ron Pedde <ron@pedde.com>
diff --git a/CREDITS b/CREDITS
index 10a6de7e..bfe3fa2f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,4 +1,3 @@
-* $Id$ */
 
 I've received lots of help from people on this project.
 
diff --git a/Makefile.am b/Makefile.am
index a5bdc244..f72226fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-# $Id$
-#
+
 EXTRA_DIST = configure CREDITS
 SUBDIRS=src admin-root contrib
 
diff --git a/README b/README
index 9766070d..ea788bd2 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-$Id$
-
 Here's the short and sweet of it:
 
 ./configure; make; make install
diff --git a/admin-root/CREDITS b/admin-root/CREDITS
index c6e9f577..bfe3fa2f 100644
--- a/admin-root/CREDITS
+++ b/admin-root/CREDITS
@@ -1,4 +1,3 @@
-* $Id$ */
 
 I've received lots of help from people on this project.
 
@@ -146,3 +145,9 @@ Gareth Potter
 Anton Johansson
  * Swedish Translations
 
+Ian Burrell
+ * configure patches to put plugins in libdir
+ * RH/Centos/Fedora specfiles
+
+Stephane Moreau
+ * admin page updates to make apache rewrites easier
diff --git a/admin-root/Makefile.am b/admin-root/Makefile.am
index 0b2b33ed..a6ff0938 100644
--- a/admin-root/Makefile.am
+++ b/admin-root/Makefile.am
@@ -1,5 +1,4 @@
-# $Id$
-#
+
 SUBDIRS=lib-js
 
 adminrootdir = ${pkgdatadir}/admin-root
diff --git a/admin-root/lib-js/Makefile.am b/admin-root/lib-js/Makefile.am
index dc3c9442..415af0de 100644
--- a/admin-root/lib-js/Makefile.am
+++ b/admin-root/lib-js/Makefile.am
@@ -1,5 +1,4 @@
-# $Id: Makefile.am 712 2005-11-20 10:02:31Z rpedde $
-#
+
 SUBDIRS=script.aculo.us
 
 jslibdir = ${pkgdatadir}/admin-root/lib-js
diff --git a/admin-root/lib-js/script.aculo.us/Makefile.am b/admin-root/lib-js/script.aculo.us/Makefile.am
index 3ad2f2e2..efb8d3ce 100644
--- a/admin-root/lib-js/script.aculo.us/Makefile.am
+++ b/admin-root/lib-js/script.aculo.us/Makefile.am
@@ -1,5 +1,4 @@
-# $Id: Makefile.am 712 2005-11-20 10:02:31Z rpedde $
-#
+
 scriptaculousdir = ${pkgdatadir}/admin-root/lib-js/script.aculo.us
 scriptaculous_DATA = builder.js controls.js dragdrop.js effects.js \
                      scriptaculous.js slider.js unittest.js
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b184ba11..a26be3d7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,4 @@
-# $Id$
-#
+
 SUBDIRS = init.d
 
 EXTRA_DIST = README mt-daapd.spec mt-daapd.conf.templ mt-daapd-ssc.sh mt-daapd-ssc.pl
diff --git a/contrib/README b/contrib/README
index 745e5f43..8cd480b7 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,5 +1,3 @@
-# $Id$
-
 In here goes stuff that anyone wants to send... add-ons, unsupported patches, etc.
 
 
diff --git a/contrib/mt-daapd-ssc.pl b/contrib/mt-daapd-ssc.pl
index a237b7df..1847b386 100755
--- a/contrib/mt-daapd-ssc.pl
+++ b/contrib/mt-daapd-ssc.pl
@@ -1,7 +1,5 @@
 #!/usr/bin/env perl
 #
-#  $Id$
-#
 #   -*- perl -*-
 #
 #  ----------------------------------------------------------------------
diff --git a/contrib/mt-daapd.conf.templ b/contrib/mt-daapd.conf.templ
index a0533bfd..3a6fec87 100644
--- a/contrib/mt-daapd.conf.templ
+++ b/contrib/mt-daapd.conf.templ
@@ -1,4 +1,3 @@
-# $Id$
 #
 # This is the mt-daapd config file.
 #
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e56622a..eecb8860 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-# $Id$
-#
+
 SUBDIRS = plugins
 
 sbin_PROGRAMS = mt-daapd
diff --git a/src/bsd-snprintf.h b/src/bsd-snprintf.h
index d1033643..cf863e78 100644
--- a/src/bsd-snprintf.h
+++ b/src/bsd-snprintf.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Created by Ron Pedde on 2007-07-01.
  * Copyright (C) 2007 Firefly Media Services. All rights reserved.
  *
diff --git a/src/conf.c b/src/conf.c
index 1d508ace..1c127e5f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Functions for reading and writing the config file
  *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
diff --git a/src/conf.h b/src/conf.h
index a93d44ce..ac6512cd 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Functions for reading and writing the config file
  *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
diff --git a/src/configfile.c b/src/configfile.c
index edc3707f..38751c73 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Functions for reading and writing the config file
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/configfile.h b/src/configfile.h
index 7bf19754..5c883134 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Functions for reading and writing the config file
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/daapd.h b/src/daapd.h
index 49604851..91f102df 100644
--- a/src/daapd.h
+++ b/src/daapd.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Header info for daapd server
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/db-generic.c b/src/db-generic.c
index 1a0e2993..9da6767f 100644
--- a/src/db-generic.c
+++ b/src/db-generic.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Generic db implementation for specific sql backend
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/db-generic.h b/src/db-generic.h
index f9033ffc..2f4919ed 100644
--- a/src/db-generic.h
+++ b/src/db-generic.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Header info for generic database
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/db-sql-sqlite3.c b/src/db-sql-sqlite3.c
index b2e2fc49..0d818508 100644
--- a/src/db-sql-sqlite3.c
+++ b/src/db-sql-sqlite3.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * sqlite3-specific db implementation
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/db-sql-sqlite3.h b/src/db-sql-sqlite3.h
index 6b4a5f40..6858ac24 100644
--- a/src/db-sql-sqlite3.h
+++ b/src/db-sql-sqlite3.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * sqlite3-specific db implementation
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/db-sql-updates.c b/src/db-sql-updates.c
index 94e5d6c6..32c88382 100644
--- a/src/db-sql-updates.c
+++ b/src/db-sql-updates.c
@@ -1,5 +1,4 @@
 /*
- * $Id: $
  * Commands to update database to new version
  *
  */
diff --git a/src/db-sql.c b/src/db-sql.c
index a0368246..efa196b2 100644
--- a/src/db-sql.c
+++ b/src/db-sql.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * sql-specific db implementation
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/db-sql.h b/src/db-sql.h
index ebfcb743..210dc19b 100644
--- a/src/db-sql.h
+++ b/src/db-sql.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * sql-specific db implementation
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/err.c b/src/err.c
index d6c75b3a..70207b36 100644
--- a/src/err.c
+++ b/src/err.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Generic error handling
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/err.h b/src/err.h
index 676b78fa..77f2d5eb 100644
--- a/src/err.h
+++ b/src/err.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Error related routines
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/ff-dbstruct.h b/src/ff-dbstruct.h
index e76bbc97..2975a052 100644
--- a/src/ff-dbstruct.h
+++ b/src/ff-dbstruct.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Database structure and fields
  */
 
diff --git a/src/ff-plugins.h b/src/ff-plugins.h
index 7d942a9f..b3b47385 100644
--- a/src/ff-plugins.h
+++ b/src/ff-plugins.h
@@ -1,5 +1,4 @@
 /*
- * $Id: $
  * Public plug-in interface
  *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
diff --git a/src/io-errors.h b/src/io-errors.h
index f1bd9d36..d04d8e5f 100644
--- a/src/io-errors.h
+++ b/src/io-errors.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Created by Ron Pedde on 2007-07-01.
  * Copyright (C) 2007 Firefly Media Services. All rights reserved.
  *
diff --git a/src/io-plugin.h b/src/io-plugin.h
index b4288f71..570fa0a5 100644
--- a/src/io-plugin.h
+++ b/src/io-plugin.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Private interface for io objects to provide plug-in io objects
  */
 
diff --git a/src/io.c b/src/io.c
index bee10e5b..b2d6a226 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Generic IO handling for files/sockets/etc
  */
 
diff --git a/src/io.h b/src/io.h
index 4e9b4a82..d6770d95 100644
--- a/src/io.h
+++ b/src/io.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Generic IO abstraction for files, sockets, http streams, etc
  */
 
diff --git a/src/ll.c b/src/ll.c
index f2f254b2..a075234a 100644
--- a/src/ll.c
+++ b/src/ll.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Rock stupid char* indexed linked lists
  *
  * Copyright (C) 2006 Ron Pedde (rpedde@users.sourceforge.net)
diff --git a/src/ll.h b/src/ll.h
index c4f89257..3dd015a5 100644
--- a/src/ll.h
+++ b/src/ll.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Rock stupid char* indexed linked lists
  *
  * Copyright (C) 2006 Ron Pedde (rpedde@users.sourceforge.net)
diff --git a/src/main.c b/src/main.c
index 8e8aea64..070a09a0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Driver for multi-threaded daap server
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/mp3-scanner.c b/src/mp3-scanner.c
index bcaade5c..2621fe01 100644
--- a/src/mp3-scanner.c
+++ b/src/mp3-scanner.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Implementation file for mp3 scanner and monitor
  *
  * Ironically, this now scans file types other than mp3 files,
diff --git a/src/mp3-scanner.h b/src/mp3-scanner.h
index b729290e..51203ef0 100644
--- a/src/mp3-scanner.h
+++ b/src/mp3-scanner.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Header file for mp3 scanner and monitor
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/os-unix.c b/src/os-unix.c
index 4b957b76..a6b33f33 100644
--- a/src/os-unix.c
+++ b/src/os-unix.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Abstracts os interface
  *
  * Copyright (c) 2006 Ron Pedde (rpedde@users.sourceforge.net)
diff --git a/src/os-unix.h b/src/os-unix.h
index 51f7096b..d4ea184b 100644
--- a/src/os-unix.h
+++ b/src/os-unix.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Copyright (C) 2006 Ron Pedde (rpedde@users.sourceforge.net)
  *
  */
diff --git a/src/os.h b/src/os.h
index df37f512..9b0ae66f 100644
--- a/src/os.h
+++ b/src/os.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Abstract os interface for non-unix platforms
  *
  * Copyright (C) 2006 Ron Pedde (rpedde@users.sourceforge.net)
diff --git a/src/plugin.c b/src/plugin.c
index 7758ad8b..6f72957b 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1,5 +1,4 @@
 /*
- * $Id: $
  * Simple plug-in api for output, transcode, and scanning plug-ins
  *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
diff --git a/src/plugin.h b/src/plugin.h
index 45c82b8c..d4ac55c1 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -1,5 +1,4 @@
 /*
- * $Id: $
  * Simple plug-in api for output, transcode, and scanning plug-ins
  *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 1d4dcd35..3e6e8866 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,5 +1,4 @@
-# $Id: $
-#
+
 rspdir = ${pkglibdir}/plugins
 out_daapdir = ${pkglibdir}/plugins
 ssc_ffmpegdir = ${pkglibdir}/plugins
diff --git a/src/plugins/out-daap-proto.c b/src/plugins/out-daap-proto.c
index 961af0b5..e4084d26 100644
--- a/src/plugins/out-daap-proto.c
+++ b/src/plugins/out-daap-proto.c
@@ -1,6 +1,3 @@
-/*
- * $Id: $
- */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/plugins/out-daap-proto.h b/src/plugins/out-daap-proto.h
index a403093b..976475f0 100644
--- a/src/plugins/out-daap-proto.h
+++ b/src/plugins/out-daap-proto.h
@@ -1,6 +1,3 @@
-/*
- * $Id: $
- */
 
 #ifndef _OUT_DAAP_PROTO_H_
 #define _OUT_DAAP_PROTO_H_
diff --git a/src/plugins/out-daap.c b/src/plugins/out-daap.c
index e1b71068..ca446596 100644
--- a/src/plugins/out-daap.c
+++ b/src/plugins/out-daap.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * daap plugin handler and dispatch code
  *
  * Copyright (C) 2003-2006 Ron Pedde (ron@pedde.com)
diff --git a/src/plugins/out-daap.h b/src/plugins/out-daap.h
index 6f693d06..4d86c417 100644
--- a/src/plugins/out-daap.h
+++ b/src/plugins/out-daap.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifndef _OUT_DAAP_H_
 #define _OUT_DAAP_H_
diff --git a/src/plugins/rsp.c b/src/plugins/rsp.c
index 1d954dcf..8244d157 100644
--- a/src/plugins/rsp.c
+++ b/src/plugins/rsp.c
@@ -1,6 +1,3 @@
-/*
- * $Id: $
- */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/plugins/rsp.h b/src/plugins/rsp.h
index 302afe41..5c9db346 100644
--- a/src/plugins/rsp.h
+++ b/src/plugins/rsp.h
@@ -1,6 +1,3 @@
-/* 
- * $Id: $
- */
 
 #ifndef _RSP_H_
 #define _RSP_H_
diff --git a/src/plugins/ssc-ffmpeg.c b/src/plugins/ssc-ffmpeg.c
index ee3f9c5c..14206982 100644
--- a/src/plugins/ssc-ffmpeg.c
+++ b/src/plugins/ssc-ffmpeg.c
@@ -1,6 +1,3 @@
-/*
- * $Id: $
- */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/src/plugins/ssc-script.c b/src/plugins/ssc-script.c
index b620cef0..c516c453 100644
--- a/src/plugins/ssc-script.c
+++ b/src/plugins/ssc-script.c
@@ -1,6 +1,3 @@
-/*
- * $Id: $
- */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/src/plugins/xml-rpc.c b/src/plugins/xml-rpc.c
index 432b3a7d..f529aff2 100644
--- a/src/plugins/xml-rpc.c
+++ b/src/plugins/xml-rpc.c
@@ -1,6 +1,4 @@
 /*
- * $Id: xml-rpc.c 970 2006-04-20 06:52:21Z rpedde $
- *
  * This really isn't xmlrpc.  It's xmlrpc-ish.  Emphasis on -ish.
  */
 
diff --git a/src/plugins/xml-rpc.h b/src/plugins/xml-rpc.h
index ea4d8114..97fa2b4a 100644
--- a/src/plugins/xml-rpc.h
+++ b/src/plugins/xml-rpc.h
@@ -1,6 +1,3 @@
-/*
- * $Id: xml-rpc.h 917 2006-04-04 06:31:19Z rpedde $
- */
 
 #ifndef _XMLRPC_H_
 #define _XMLRPC_H_
diff --git a/src/redblack.c b/src/redblack.c
index 3cb4c473..968fd57e 100644
--- a/src/redblack.c
+++ b/src/redblack.c
@@ -1,5 +1,3 @@
-static char rcsid[]="$Id$";
-
 /*
    Redblack balanced tree algorithm
    Copyright (C) Damian Ivereigh 2000
@@ -150,8 +148,6 @@ RB_STATIC struct RB_ENTRY(tree) *RB_ENTRY(init)(void)
         struct RB_ENTRY(tree) *retval;
         char c;
 
-        c=rcsid[0]; /* This does nothing but shutup the -Wall */
-
         if ((retval=(struct RB_ENTRY(tree) *) malloc(sizeof(struct RB_ENTRY(tree))))==NULL)
                 return(NULL);
 
@@ -1094,7 +1090,6 @@ RB_ENTRY(dumptree)(struct RB_ENTRY(node) *x, int n)
 #endif
 
 /*
- * $Log$
  * Revision 1.4  2006/02/26 08:46:24  rpedde
  * Merged win32-branch
  *
diff --git a/src/redblack.h b/src/redblack.h
index f188f7e1..2bb3d0f6 100644
--- a/src/redblack.h
+++ b/src/redblack.h
@@ -1,7 +1,3 @@
-/*
- * RCS $Id$
- */
-
 /*
    Redblack balanced tree algorithm
    Copyright (C) Damian Ivereigh 2000
@@ -137,7 +133,6 @@ RB_STATIC void RB_ENTRY(closelist)(RBLIST *);
 
 /*
  *
- * $Log$
  * Revision 1.4  2006/02/26 08:46:24  rpedde
  * Merged win32-branch
  *
diff --git a/src/rend.h b/src/rend.h
index acbd8ddd..6acea6d0 100644
--- a/src/rend.h
+++ b/src/rend.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Rendezvous stuff
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/restart.c b/src/restart.c
index 97f066a1..2a285359 100644
--- a/src/restart.c
+++ b/src/restart.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Restart Library
  *
  * ** NOTICE **
diff --git a/src/restart.h b/src/restart.h
index 43d980e1..19729f01 100644
--- a/src/restart.h
+++ b/src/restart.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Restart Library
  *
  * ** NOTICE **
diff --git a/src/rxml.c b/src/rxml.c
index fc3520e4..141e892f 100644
--- a/src/rxml.c
+++ b/src/rxml.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/src/rxml.h b/src/rxml.h
index 96d851cc..43a4e45f 100644
--- a/src/rxml.h
+++ b/src/rxml.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifndef _RXML_H_
 #define _RXML_H_
diff --git a/src/scan-aac.c b/src/scan-aac.c
index 596768b8..ba77fe91 100644
--- a/src/scan-aac.c
+++ b/src/scan-aac.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-aac.h b/src/scan-aac.h
index ac167911..ca4af74f 100644
--- a/src/scan-aac.h
+++ b/src/scan-aac.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-aif.c b/src/scan-aif.c
index e5f4622b..4efd1744 100644
--- a/src/scan-aif.c
+++ b/src/scan-aif.c
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Copyright (C) 2006 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-flac.c b/src/scan-flac.c
index 0d01cf27..a728392a 100644
--- a/src/scan-flac.c
+++ b/src/scan-flac.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Implementation file for server side format conversion.
  *
  * Copyright (C) 2005 Timo J. Rinne (tri@iki.fi)
diff --git a/src/scan-mp3.c b/src/scan-mp3.c
index ecb48727..d94a3fa4 100644
--- a/src/scan-mp3.c
+++ b/src/scan-mp3.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-mpc.c b/src/scan-mpc.c
index bb4e329b..3430ade9 100644
--- a/src/scan-mpc.c
+++ b/src/scan-mpc.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Musepack tag parsing routines.
  *
  * Copyright (C) 2005 Sebastian Dröge <slomo@ubuntu.com>
diff --git a/src/scan-ogg.c b/src/scan-ogg.c
index b2178604..19f4855c 100644
--- a/src/scan-ogg.c
+++ b/src/scan-ogg.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Ogg parsing routines.
  *
  *
diff --git a/src/scan-url.c b/src/scan-url.c
index e36a61f8..d5bedca1 100644
--- a/src/scan-url.c
+++ b/src/scan-url.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-wav.c b/src/scan-wav.c
index 7d979bd6..0b2aaa68 100644
--- a/src/scan-wav.c
+++ b/src/scan-wav.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/scan-wma.c b/src/scan-wma.c
index e5baefa8..3b826e4b 100644
--- a/src/scan-wma.c
+++ b/src/scan-wma.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * WMA metatag parsing
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/scan-xml.c b/src/scan-xml.c
index a89dfa8a..2fee2dcf 100644
--- a/src/scan-xml.c
+++ b/src/scan-xml.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Implementation file iTunes metainfo scanning
  *
  * Copyright (C) 2005 Ron Pedde (ron@pedde.com)
diff --git a/src/smart-parser.c b/src/smart-parser.c
index aef70381..de9885b0 100644
--- a/src/smart-parser.c
+++ b/src/smart-parser.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This is really two parts -- the lexer and the parser.  Converting
  * a parse tree back to a format that works with the database backend
  * is left to the db backend.
diff --git a/src/smart-parser.h b/src/smart-parser.h
index 2d15f568..3f696eef 100644
--- a/src/smart-parser.h
+++ b/src/smart-parser.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifndef _SMART_PARSER_H_
 #define _SMART_PARSER_H_
diff --git a/src/uici.c b/src/uici.c
index 7df83e39..59c5187e 100644
--- a/src/uici.c
+++ b/src/uici.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Sockets Library
  *
  * ** NOTICE **
diff --git a/src/uici.h b/src/uici.h
index 9fa0df7c..91511918 100644
--- a/src/uici.h
+++ b/src/uici.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Sockets Library
  *
  * ** NOTICE **
diff --git a/src/upnp.c b/src/upnp.c
index c7c36784..f32390bc 100644
--- a/src/upnp.c
+++ b/src/upnp.c
@@ -1,5 +1,4 @@
 /**
- * $Id: $
  *
  * Implementation of functions for UPnP discovery
  *
diff --git a/src/upnp.h b/src/upnp.h
index ced13dc4..ce532af6 100644
--- a/src/upnp.h
+++ b/src/upnp.h
@@ -1,6 +1,4 @@
 /*
- * $Id: $
- *
  * Header functions for UPnP discovery
  *
  * Copyright (C) 2007 Ron Pedde (ron@pedde.com)
diff --git a/src/wavstreamer.c b/src/wavstreamer.c
index 47aec3aa..b97e91b5 100644
--- a/src/wavstreamer.c
+++ b/src/wavstreamer.c
@@ -1,8 +1,6 @@
 /*
  * -*- c -*-
  *
- * $Id$
- *
  * Read wav file from stdin and patch the info in header and write
  * it to stdout.
  *
diff --git a/src/webserver.c b/src/webserver.c
index 514bf7b3..61253f93 100644
--- a/src/webserver.c
+++ b/src/webserver.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Webserver library
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/webserver.h b/src/webserver.h
index f792cead..d9e9c70f 100644
--- a/src/webserver.h
+++ b/src/webserver.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Webserver library
  *
  * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
diff --git a/src/wsprivate.h b/src/wsprivate.h
index 523b3edb..8405eddc 100644
--- a/src/wsprivate.h
+++ b/src/wsprivate.h
@@ -1,5 +1,4 @@
 /*
- * $Id: os.h 1479 2007-01-09 18:12:39Z rpedde $
  * Abstract os interface for non-unix platforms
  *
  * Copyright (C) 2006 Ron Pedde (rpedde@users.sourceforge.net)
diff --git a/src/xml-rpc.c b/src/xml-rpc.c
index f81dbd32..7f9552bc 100644
--- a/src/xml-rpc.c
+++ b/src/xml-rpc.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This really isn't xmlrpc.  It's xmlrpc-ish.  Emphasis on -ish.
  */
 
diff --git a/src/xml-rpc.h b/src/xml-rpc.h
index 9d75d3a9..937d2cf7 100644
--- a/src/xml-rpc.h
+++ b/src/xml-rpc.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifndef _XMLRPC_H_
 #define _XMLRPC_H_
diff --git a/tools/decodeflow.c b/tools/decodeflow.c
index d9b5dfe1..6896f7ef 100644
--- a/tools/decodeflow.c
+++ b/tools/decodeflow.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Decode a tcpflow from iTunes
  */