diff --git a/.gitattributes b/.gitattributes
index 126f6cd706e5fbf2f54ded43abcc596e40d1d570..3a2b05ca57c22ab64a196380fc82e50674acb2aa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 [attr]binary -text -crlf -diff -ident
-* text ident
+* text -ident
 *.pdu binary
 /src/testsuite/UTF-8-test.txt binary
 LICENSE eol=crlf
diff --git a/aclocal.m4 b/aclocal.m4
index 83b467ba4f550420f915dd1eab29f168e086c164..d2915e9e7870cfced8dd73f3c2026fe5fe936e46 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -523,7 +523,6 @@ dnl Remember, if the system already had a valid <stdint.h>, the generated
 dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
 dnl
 dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/)
-dnl @version $Id$
 dnl @author  Guido Draheim <guidod@gmx.de> 
 
 AC_DEFUN([AX_CREATE_STDINT_H],
diff --git a/nettle/cast128_sboxes.h b/nettle/cast128_sboxes.h
index afc299ab7911c99712693858f0afb65ac4fe5cd0..c0d33f9bc6306529e4c2525f337b511ac7d6db9e 100644
--- a/nettle/cast128_sboxes.h
+++ b/nettle/cast128_sboxes.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  *	CAST-128 in C
  *	Written by Steve Reid <sreid@sea-to-sky.net>
  *	100% Public Domain - no warranty
diff --git a/nettle/desCode.h b/nettle/desCode.h
index cdb30873ab10a840344a99c1dd522607c566802f..738569fb9f8a365df5522568fa84021a9d34de8c 100644
--- a/nettle/desCode.h
+++ b/nettle/desCode.h
@@ -1,6 +1,6 @@
 /* desCode.h
  *
- * $Id$ */
+ */
 
 /*	des - fast & portable DES encryption & decryption.
  *	Copyright (C) 1992  Dana L. How
diff --git a/nettle/descore.README b/nettle/descore.README
index 2692f94e96b4055b79d51b104430fcd2d893af38..8328a4a28d672a440e2a10c52bd2b84db4fee67f 100644
--- a/nettle/descore.README
+++ b/nettle/descore.README
@@ -17,7 +17,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 Author's address: how@isl.stanford.edu
 
-$Id$
 
 
 ==>> To compile after untarring/unsharring, just `make' <<==
diff --git a/nettle/desdata.c b/nettle/desdata.c
index bf37ec18439e2b0daaf95d461c1aecb45cd4be8d..fc89c2d048c083a73452f725c5913c4f5a18e1bb 100644
--- a/nettle/desdata.c
+++ b/nettle/desdata.c
@@ -2,7 +2,7 @@
  *
  * Generate tables used by des.c and desCode.h.
  *
- * $Id$ */
+ */
 
 /*
  *	des - fast & portable DES encryption & decryption.
diff --git a/nettle/desinfo.h b/nettle/desinfo.h
index 0c4ce3b6653033abd4b58a2fd715367db7634e4a..21af02c7154007eb031ea668242efc779945626e 100644
--- a/nettle/desinfo.h
+++ b/nettle/desinfo.h
@@ -3,7 +3,7 @@
  * Tables describing DES rather than just this implementation.
  * These are used in desdata but NOT in runtime code.
  *
- * $Id$ */
+ */
 
 /*	des - fast & portable DES encryption & decryption.
  *	Copyright (C) 1992  Dana L. How
diff --git a/sftp/client.c b/sftp/client.c
index 869b2aa3ab9e4f66639082e8ceb36c6f681e45af..ebc15dbc992e1ba4432afc17eae6baccddb52870 100644
--- a/sftp/client.c
+++ b/sftp/client.c
@@ -2,7 +2,6 @@
  *
  * Utility functions for the client side of the protocol.
  *
- * $Id$
  */
 
 /* lsh, an implementation of the ssh protocol
diff --git a/sftp/client.h b/sftp/client.h
index e6d94e25910748142bfea4fbf790b3be4e761586..f914365786ae3b57f28f4eb9a91f63253d58c3b0 100644
--- a/sftp/client.h
+++ b/sftp/client.h
@@ -2,7 +2,6 @@
  *
  * Utility functions for the client side of the protocol.
  *
- * $Id$
  */
 
 /* lsh, an implementation of the ssh protocol
diff --git a/sftp/commands.c b/sftp/commands.c
index bb7b5f36aa21b83857245b4076b84335783d9ab2..1cdf14cc8d1ee982579f49d93cb78102988c6488 100644
--- a/sftp/commands.c
+++ b/sftp/commands.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * commands.c
  */
 
diff --git a/sftp/commands.h b/sftp/commands.h
index 61db129c99c21ac745bdf39dd67d4ed400c5369b..c24ab51a1c7c036c6026e191f79dece768c12ec3 100644
--- a/sftp/commands.h
+++ b/sftp/commands.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * commands.h
  */
 
diff --git a/sftp/configure.ac b/sftp/configure.ac
index bbbfb69e6d3f1fea3a4223f0ce672b90dc4086a3..36c958ef7c2a6f4b43c121bf8973e16c96976843 100644
--- a/sftp/configure.ac
+++ b/sftp/configure.ac
@@ -1,5 +1,4 @@
 dnl -*- mode: shell-script; sh-indentation: 2; -*-
-dnl $Id$
 
 dnl Process this file with autoconf to produce a configure script.
 
diff --git a/sftp/dc.c b/sftp/dc.c
index dcbd6df3c0ceb3eeb5427adb8da85b568c376221..04c8850e82e75c4cc8c63af0d618410203c56181 100644
--- a/sftp/dc.c
+++ b/sftp/dc.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * dc.c - dircache functions
  */
 
diff --git a/sftp/dc.h b/sftp/dc.h
index 4a24e88075c355f21b81b8572c9b201b115abec1..c148ee01aa8176f40947a8edbaf4c3b7bf94f53b 100644
--- a/sftp/dc.h
+++ b/sftp/dc.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * dc.h - dircache functions
  *
  */
diff --git a/sftp/gnu_stuff.c b/sftp/gnu_stuff.c
index d58bf994d958ec1d0c21be10dfff1fc592216c83..e6fef0a26d08a05e1010e3c56826f9f5242019cf 100644
--- a/sftp/gnu_stuff.c
+++ b/sftp/gnu_stuff.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * gnu_stuff.c
  */
 
diff --git a/sftp/gnu_stuff.h b/sftp/gnu_stuff.h
index a978ac24f162a55079cf244b02ef126e92f2ee72..458f7190f3198a3a087246882204f38735fcc549 100644
--- a/sftp/gnu_stuff.h
+++ b/sftp/gnu_stuff.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * gnu_stuff.h
  */
 
diff --git a/sftp/lsftp.c b/sftp/lsftp.c
index 2721ae4d9d5af64964ccacbe36316f23ded8d961..562aa75c95ab14b652c019b25ed47d636d9ad04e 100644
--- a/sftp/lsftp.c
+++ b/sftp/lsftp.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * lsftp.c
  */
 
diff --git a/sftp/lsftp.h b/sftp/lsftp.h
index 52a3c000f0fe600b6fbb9d658989d49eb6a0977c..d10850db5fb6fd34ec4b563447f37fe4db9cf5a8 100644
--- a/sftp/lsftp.h
+++ b/sftp/lsftp.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * lsftp.h
  */
 
diff --git a/sftp/misc_fun.c b/sftp/misc_fun.c
index e5dc8a8ab0e2ab957a7ccf1a338cc96b6792c961..1998e9f4af11b5344043f02d5c5c95fcc57e6025 100644
--- a/sftp/misc_fun.c
+++ b/sftp/misc_fun.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * misc_fun.c
  */
 
diff --git a/sftp/misc_fun.h b/sftp/misc_fun.h
index a966bfe26257bc6a6b53944d28d5e884633944b8..2efa87879d2af9eb67ca6fbe318f6945669b113b 100644
--- a/sftp/misc_fun.h
+++ b/sftp/misc_fun.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * misc_fun.h
  */
 
diff --git a/sftp/rl.c b/sftp/rl.c
index 98bd9e829202c07726054edc4eac6cb5fb5e38fd..b264fb6522b9820476d6b07237ecfde8dbe0e255 100644
--- a/sftp/rl.c
+++ b/sftp/rl.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * rl.c
  */
 
diff --git a/sftp/rl.h b/sftp/rl.h
index 945c118f9e70e0d0fd630f7b86d25e28add03014..bb2379e5891469ee6af918ab648ba8e33275c06a 100644
--- a/sftp/rl.h
+++ b/sftp/rl.h
@@ -1,5 +1,4 @@
 /*
- * @(#) $Id$
  *
  * rl.h
  */
diff --git a/sftp/sftp-server.c b/sftp/sftp-server.c
index 4c66043fa0d0637c99b3972f3d1ac83966500d10..6e7159b51e207a71f9ceedc3f54fd2c7e4f790d2 100644
--- a/sftp/sftp-server.c
+++ b/sftp/sftp-server.c
@@ -1,6 +1,4 @@
 /* sftp-server.c
- *
- * $Id$
  *
  * The server side of the sftp subsystem. */
 
diff --git a/sftp/sftp_bind.c b/sftp/sftp_bind.c
index f11da164461ee13c2cca7d93adf5375a201769c1..95775c9feff81449b03a2c36099fcc795e0d764a 100644
--- a/sftp/sftp_bind.c
+++ b/sftp/sftp_bind.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * sftp_bind.c - bindings for sftp.c
  *
  * Portions of code taken from the sftp test client from 
diff --git a/sftp/sftp_bind.h b/sftp/sftp_bind.h
index b758b8e0509c2fd79663aabe23ea149fd44e8fd4..5349a7fd898c9fe6ff8c529453a4bf0a70104833 100644
--- a/sftp/sftp_bind.h
+++ b/sftp/sftp_bind.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * sftp_bind.h 
  *
  * Portions of code taken from the sftp test client from
diff --git a/sftp/sftp_c.c b/sftp/sftp_c.c
index d7736f2d4ec0a583b2c81dd877bcdcdc8cce555a..381930aafa8d7b8fce059b62e9278053f5482f1b 100644
--- a/sftp/sftp_c.c
+++ b/sftp/sftp_c.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * sftp_c.c - sftp client protocol functions.
  *
  * Portions of code taken from the sftp test client from 
diff --git a/sftp/sftp_c.h b/sftp/sftp_c.h
index 25a55b1554e4f90d9233cee20cefa74a5fdfbb5c..2d7d8a318613165f98bfce5bfe11fd3a6234a760 100644
--- a/sftp/sftp_c.h
+++ b/sftp/sftp_c.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * sftp_c.h
  *
  * Portions of code taken from the sftp test client from
diff --git a/sftp/str_utils.c b/sftp/str_utils.c
index 88c86704a9d98d44dccdc28e977e661707f707a8..7d5d5368ecf4e16780afd703c7c3f8b7ba4871ed 100644
--- a/sftp/str_utils.c
+++ b/sftp/str_utils.c
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * str_utils.c
  */
 
diff --git a/sftp/str_utils.h b/sftp/str_utils.h
index 0772e7471bf61828823abb6dcdfbb65db4f32264..fe96783d47d05cd7a5f7cf899b2243319786fa7c 100644
--- a/sftp/str_utils.h
+++ b/sftp/str_utils.h
@@ -1,6 +1,4 @@
 /*
- * @(#) $Id$
- *
  * str_utils.h
  */
 
diff --git a/sftp/werror.c b/sftp/werror.c
index cc7ca8e4fda3a532018c763b03726c4b2437005a..0dd5e6e16055e95187f72bde747ceed35851f700 100644
--- a/sftp/werror.c
+++ b/sftp/werror.c
@@ -2,7 +2,6 @@
  *
  * Simple diagnostics routines.
  *
- * $id$
  */
 
 #if HAVE_CONFIG_H
diff --git a/sftp/werror.h b/sftp/werror.h
index 60ff77e9f2be75ab7fb2bbcdbe9a40af747019f2..952bc76aa6e68d6c9a21359d41a041a81f8c0bea 100644
--- a/sftp/werror.h
+++ b/sftp/werror.h
@@ -2,7 +2,6 @@
  *
  * Simple diagnostics routines.
  *
- * $id$
  */
 
 #ifndef SFTP_WERROR_H_INCLUDED
diff --git a/src/scm/scsh-compat.scm b/src/scm/scsh-compat.scm
index c29169bf69b35ec882ea8820ea841c1a8edc2d41..dbc488fdad694851f66796ebebaf7bdd6c970cc9 100644
--- a/src/scm/scsh-compat.scm
+++ b/src/scm/scsh-compat.scm
@@ -1,8 +1,6 @@
 ;; scsh.scm
 ;;
 ;; Extra definitions needed when using scsh.
-;;
-;; $Id$
 
 ;; lsh, an implementation of the ssh protocol
 ;;