diff --git a/COPYING b/COPYING
index 4ee13ed..c0f1976 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-$Id$
+fontconfig/COPYING
 
 Copyright © 2001,2003 Keith Packard
 
diff --git a/Makefile.am b/Makefile.am
index 6e1c207..45c71bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index eeb3974..b5284f1 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/conf.d/Makefile.am
 # 
 #  Copyright © 2005 Keith Packard
 # 
diff --git a/configure.in b/configure.in
index e381475..e9166c7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl 
-dnl  $Id$
+dnl  fontconfig/configure.in
 dnl 
 dnl  Copyright © 2003 Keith Packard
 dnl 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0e7b839..2bc1f5e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id$
+# fontconfig/doc/Makefile.am
 #
 # Copyright © 2003 Keith Packard
 #
diff --git a/doc/confdir.sgml.in b/doc/confdir.sgml.in
index d190d0c..60ee961 100644
--- a/doc/confdir.sgml.in
+++ b/doc/confdir.sgml.in
@@ -1,5 +1,5 @@
 <!--  
-   $Id$
+   fontconfig/doc/confdir.sgml.in
   
    Copyright © 2003 Keith Packard
   
diff --git a/doc/edit-sgml.c b/doc/edit-sgml.c
index 02f4a46..6638a7c 100644
--- a/doc/edit-sgml.c
+++ b/doc/edit-sgml.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/edit-sgml.c
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcatomic.fncs b/doc/fcatomic.fncs
index 54ea696..4e60eb7 100644
--- a/doc/fcatomic.fncs
+++ b/doc/fcatomic.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcatomic.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcblanks.fncs b/doc/fcblanks.fncs
index 5b8bab3..cda5a5b 100644
--- a/doc/fcblanks.fncs
+++ b/doc/fcblanks.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcblanks.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fccharset.fncs b/doc/fccharset.fncs
index f4e81a7..f4c7d32 100644
--- a/doc/fccharset.fncs
+++ b/doc/fccharset.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fccharset.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcconfig.fncs b/doc/fcconfig.fncs
index 0360df9..2b3f81d 100644
--- a/doc/fcconfig.fncs
+++ b/doc/fcconfig.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcconfig.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcconstant.fncs b/doc/fcconstant.fncs
index 8fb4e90..e492359 100644
--- a/doc/fcconstant.fncs
+++ b/doc/fcconstant.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcconstant.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcfile.fncs b/doc/fcfile.fncs
index 80d7e7f..7a98044 100644
--- a/doc/fcfile.fncs
+++ b/doc/fcfile.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcfile.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcfontset.fncs b/doc/fcfontset.fncs
index 3e214aa..19d4272 100644
--- a/doc/fcfontset.fncs
+++ b/doc/fcfontset.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcfontset.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcfreetype.fncs b/doc/fcfreetype.fncs
index 6eb29b1..d482144 100644
--- a/doc/fcfreetype.fncs
+++ b/doc/fcfreetype.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcfreetype.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcinit.fncs b/doc/fcinit.fncs
index 13e4604..54fa6fe 100644
--- a/doc/fcinit.fncs
+++ b/doc/fcinit.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcinit.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcmatrix.fncs b/doc/fcmatrix.fncs
index 0159555..9cad998 100644
--- a/doc/fcmatrix.fncs
+++ b/doc/fcmatrix.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcmatrix.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcobjectset.fncs b/doc/fcobjectset.fncs
index a15326a..02c089b 100644
--- a/doc/fcobjectset.fncs
+++ b/doc/fcobjectset.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcobjectset.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcobjecttype.fncs b/doc/fcobjecttype.fncs
index 8325dd6..f11137b 100644
--- a/doc/fcobjecttype.fncs
+++ b/doc/fcobjecttype.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcobjecttype.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcpattern.fncs b/doc/fcpattern.fncs
index 4775dbd..ed59580 100644
--- a/doc/fcpattern.fncs
+++ b/doc/fcpattern.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcpattern.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcstring.fncs b/doc/fcstring.fncs
index 8ba19e8..ed73040 100644
--- a/doc/fcstring.fncs
+++ b/doc/fcstring.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcstring.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcstrset.fncs b/doc/fcstrset.fncs
index d6b0520..d1869ba 100644
--- a/doc/fcstrset.fncs
+++ b/doc/fcstrset.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcstrset.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fcvalue.fncs b/doc/fcvalue.fncs
index 14d043b..0786028 100644
--- a/doc/fcvalue.fncs
+++ b/doc/fcvalue.fncs
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/doc/fcvalue.fncs
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 6ca8e60..560a862 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -21,7 +21,7 @@
 <!ENTITY version SYSTEM "version.sgml">
 ]>
 <!--
-    $Id$
+    fontconfig/doc/local-fontconfig-devel.sgml
    
     Copyright © 2003 Keith Packard
    
diff --git a/doc/func.sgml b/doc/func.sgml
index e764cdc..02b3e3d 100644
--- a/doc/func.sgml
+++ b/doc/func.sgml
@@ -1,5 +1,5 @@
 <!--
-   $Id$
+   fontconfig/doc/func.sgml
   
    Copyright © 2003 Keith Packard
   
diff --git a/doc/version.sgml.in b/doc/version.sgml.in
index bf05273..f7666c0 100644
--- a/doc/version.sgml.in
+++ b/doc/version.sgml.in
@@ -1,5 +1,5 @@
 <!--  
-   $Id$
+   fontconfig/doc/version.sgml.in
   
    Copyright © 2003 Keith Packard
   
diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 2c86a77..49c59ec 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/fc-cache/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c
index a4fffde..33edffd 100644
--- a/fc-case/fc-case.c
+++ b/fc-case/fc-case.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/fc-case/fc-case.c
  *
  * Copyright © 2004 Keith Packard
  *
diff --git a/fc-case/fccase.tmpl.h b/fc-case/fccase.tmpl.h
index 24222d2..9c06e02 100644
--- a/fc-case/fccase.tmpl.h
+++ b/fc-case/fccase.tmpl.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/fc-case/fccase.tmpl.h
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 62f983c..50ad7a7 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/fc-cat/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c
index b63ed24..e0f0a17 100644
--- a/fc-glyphname/fc-glyphname.c
+++ b/fc-glyphname/fc-glyphname.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/fc-glyphname/fc-glyphname.c
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/fc-glyphname/fcglyphname.tmpl.h b/fc-glyphname/fcglyphname.tmpl.h
index 24222d2..bbef84d 100644
--- a/fc-glyphname/fcglyphname.tmpl.h
+++ b/fc-glyphname/fcglyphname.tmpl.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * fontconfig/fc-glyphname/fcglyphname.tmpl.h
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index fcbb326..84517e7 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/fc-list/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index ca5ca39..1ca036f 100644
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id$
+#  fontconfig/fc-match/Makefile.am
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
index d75459a..9b4aa53 100644
--- a/fc-query/Makefile.am
+++ b/fc-query/Makefile.am
@@ -1,5 +1,5 @@
 #
-#  $Id$
+#  fontconfig/fc-query/Makefile.am
 #
 #  Copyright © 2003 Keith Packard
 #
diff --git a/src/Makefile.am b/src/Makefile.am
index a71ef1d..e18f937 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id$
+# fontconfig/src/Makefile.am
 #
 # Copyright © 2003 Keith Packard
 #