diff --git a/ChangeLog.pre-2.1 b/ChangeLog.pre-2.1
index c641f1a915aaf66ac7b7d2b83044b6e4efbf7185..0edc4dbeff81a3c65db45cc6b48d08ae8676b224 100644
--- a/ChangeLog.pre-2.1
+++ b/ChangeLog.pre-2.1
@@ -8365,5 +8365,3 @@ nano 0.7.6 - 01/15/2000
 0.2	Read in data to buffer, bound keystrokes to stub functions,
 	initial cursor movement on screen.  Initial autoconf support.
 0.1	Initial program setup w/ncurses
-
-$Id$
diff --git a/Makefile.am b/Makefile.am
index 41de13583e6da49053f02820b8ec8031306caf1f..f0c2845748dff102b12b11252c4aca1a5e67cc5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-## $Id$
 AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
diff --git a/TODO b/TODO
index a9060330f613c98425c49e7a790e8d441cd76ee3..88bad535ae1503e4e5194dec7324d819faa022aa 100644
--- a/TODO
+++ b/TODO
@@ -97,5 +97,3 @@ For version 1.0:
 - Now do username completion [DONE].
 - Unjustify command (^U after ^J) [DONE =-].
 - Username completion (~user) [DONE =-].
-
-$Id$
diff --git a/configure.ac b/configure.ac
index 072dc11da20b7473676ae2ebd6b2937c339d1d05..b8ba592bdd24994e548044b8988d876be7323403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,6 @@
 # along with GNU nano; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 # USA.
-#
-# $Id$
 
 AC_INIT([GNU nano], [2.5.3-svn], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
diff --git a/doc/faq.html b/doc/faq.html
index 48ec3591ee652f256de37357f9c398fd7f7065fe..b82aaf020c836e876f879a99e08a69e99a6db700 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -326,6 +326,5 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
 2000/11/18 - Previous string display (4.5).<br>
 2000/09/27 - Moved addresses to nano-editor.org.<br>
 2000/06/31 - Initial framework.</p></blockquote>
-<p>$Id$</p>
 </body>
 </html>
diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1
index 4a83bc4903684d42cb04c7d1ce98510fcce2820a..202bff0b4b79347374544dbbcf340a8c4b196a99 100644
--- a/doc/man/fr/nano.1
+++ b/doc/man/fr/nano.1
@@ -1,4 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
 .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 .\" Free Software Foundation, Inc.
 .\"
@@ -47,7 +46,6 @@
 .\"   programme. Si ce n'est pas le cas, consultez 
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id$
 .TH NANO 1 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5
index 0657ddca073868271fa675705fcfe3878964fc84..f4281af78c7eb628046738333e5ff0debf5795c5 100644
--- a/doc/man/fr/nanorc.5
+++ b/doc/man/fr/nanorc.5
@@ -1,4 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
 .\" Copyright (C) 2003, 2004, 2005, 2006, 2007
 .\" Free Software Foundation, Inc.
 .\"
@@ -47,7 +46,6 @@
 .\"   programme. Si ce n'est pas le cas, consultez
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id$
 .TH NANORC 5 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
diff --git a/doc/man/fr/rnano.1 b/doc/man/fr/rnano.1
index 3db4a54721088d46c6fc637cca32ae3753a46dc2..1020fc2c7d502574e0309573cbf3c05cff13046e 100644
--- a/doc/man/fr/rnano.1
+++ b/doc/man/fr/rnano.1
@@ -1,4 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
 .\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 .\" Skeleton based on nano-tiny.1:
 .\" Copyright (C) 2002 Free Software Foundation, Inc.
@@ -47,7 +46,6 @@
 .\"   programme. Si ce n'est pas le cas, consultez
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id$
 .TH RNANO 1 "version 2.0.0" "29\ novembre\ 20O7"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 1df33c09d7553f98801da857eaefebfa9e233744..2fdac3e080180d9325e7cd91d1de738c0e14b041 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -1,6 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" $Id$
-.\"
 .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 .\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
 .\"
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index ca319d3053d20a8812e574da130f1547b3b977cc..6d616198f31a7ca2f0352a2b93c77cb0b7fcb2e9 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -1,6 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" $Id$
-.\"
 .\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 .\" 2013, 2014, 2015 Free Software Foundation, Inc.
 .\"
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 904442b0641ec21efd140099d698d2d290b31a44..28f2abb3eecf863ff0aaa67089615c6d4d7e02ea 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -1,6 +1,3 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" $Id$
-.\"
 .\" Copyright (C) 2002, 2005, 2006, 2007, 2014 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
diff --git a/po/ChangeLog b/po/ChangeLog
index 5e4fb2f51d1ba67c53c778f43c69176d5b5f2653..7757799373ce57b2f11c44edc6c6641ebcd197dc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -996,6 +996,3 @@
 
 	* ca.po: Updated.
 	* es.po: Updated.
-
-
-$Id$
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eb761e94907182441173d6dd7ced1073880047fb..17d5acb55641252553bb7d2e5fab9cfa083be126 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-# $Id$
 # List of source files containing translatable strings.
 
 src/browser.c
diff --git a/src/browser.c b/src/browser.c
index d7d660e790f7505394e913a7c1566411ff21d854..31972be5cdc519ecabfbb1086b95dbf73729b0f5 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   browser.c                                                            *
  *                                                                        *
diff --git a/src/chars.c b/src/chars.c
index ed5983096e683d3c0caf3c83b2ab279502b8636e..00d942fc184dc72e0dd6a004e3eb4ad1d15bd3d9 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   chars.c                                                              *
  *                                                                        *
diff --git a/src/color.c b/src/color.c
index b1eb5594b70a3e44ffe4149ed9cce7e0b3b5e045..9892445c7c205af8bcd04a3b8aaed20f0f8fb519 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
diff --git a/src/cut.c b/src/cut.c
index 4a6b7b9911e59478aa395dfc29613feeb7d408f6..edd0f87586a972e5fc967f13ef0f87e601dd4da6 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
diff --git a/src/files.c b/src/files.c
index 8ea64167fd798f2c19fd0fbd9bcd474209fb4041..13f7069887359ebed4fa249f8f4acc9c2c160270 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   files.c                                                              *
  *                                                                        *
diff --git a/src/global.c b/src/global.c
index 03a954831c29a41bd2def5f704eaf397a15ef257..1c2f8af20a5702f7680dffd0aee963b29473d825 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
diff --git a/src/help.c b/src/help.c
index 7dd0bfd86417dd2ed1ae986cd037a9bcdfcab478..a0b68901f478084ee90fff2eb457747935144b08 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   help.c                                                               *
  *                                                                        *
diff --git a/src/move.c b/src/move.c
index 16dc3d6fa578e364b1bc7848169c6c341d347639..2061591b7433afbb2184d998ff8075a61112c8c4 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
diff --git a/src/nano.c b/src/nano.c
index bcdfaf5042f2d26c7cad41cc934ac20b32d39851..21cb1ed6c531d1810a40390f0ab4301dcb800892 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   nano.c                                                               *
  *                                                                        *
diff --git a/src/nano.h b/src/nano.h
index 138cf0b5070e3a0bb31e9c36e3f80ed4f4b643be..6de3fbdec45db9f85e727a21bad5180604848b69 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
diff --git a/src/prompt.c b/src/prompt.c
index d5003fde0ca3f606b7f4d1ad479a6210982b76e4..2266b891c4f5fd9ce11f5eb9cb0580e522cbfb9e 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   prompt.c                                                             *
  *                                                                        *
diff --git a/src/proto.h b/src/proto.h
index 2f7fae60cb09fdaa8f0b930d7d1ffb452e3a56ae..dfe46ea9c984fbbbdef386d06ebcfec27da324dd 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
diff --git a/src/rcfile.c b/src/rcfile.c
index bab39a27b4558c1af08ae1218b06a64dd6bd6730..0812a5b728bbf640a869e64f499cc98986fb54e9 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   rcfile.c                                                             *
  *                                                                        *
diff --git a/src/search.c b/src/search.c
index 0ad9b611db5d26b38df6dba2aa413322f1faa7db..6bd6b35f25594b0f96bd1ded3dbac6e81bb46655 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   search.c                                                             *
  *                                                                        *
diff --git a/src/text.c b/src/text.c
index 5c2bf2d40800ffc72edfabd0b31548f2b741bb6c..37388f3577a40785afe2cd85f723ec32a350b7cf 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   text.c                                                               *
  *                                                                        *
diff --git a/src/utils.c b/src/utils.c
index 6bd8b571456ad13fb9529227e5f71236e9c22b3d..5279d7c5c064461f1033e9b9e7b80e9ad72eb919 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   utils.c                                                              *
  *                                                                        *
diff --git a/src/winio.c b/src/winio.c
index 8287ed5cb7742013144e638b58b20ece19f41fac..1516738c62d9938bf86ecdf6df3de9d5195c1d4d 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *   winio.c                                                              *
  *                                                                        *