diff --git a/ChangeLog.pre-2.1 b/ChangeLog.pre-2.1
index c641f1a9..0edc4dbe 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 41de1358..f0c28457 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 a9060330..88bad535 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 072dc11d..b8ba592b 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 48ec3591..b82aaf02 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 .
.\"
-.\" $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 0657ddca..f4281af7 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
.\" .
.\"
-.\" $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 3db4a547..1020fc2c 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
.\" .
.\"
-.\" $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 1df33c09..2fdac3e0 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 ca319d30..6d616198 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 904442b0..28f2abb3 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 5e4fb2f5..77577993 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 eb761e94..17d5acb5 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 d7d660e7..31972be5 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 ed598309..00d942fc 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 b1eb5594..9892445c 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 4a6b7b99..edd0f875 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 8ea64167..13f70698 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 03a95483..1c2f8af2 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 7dd0bfd8..a0b68901 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 16dc3d6f..2061591b 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 bcdfaf50..21cb1ed6 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 138cf0b5..6de3fbde 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 d5003fde..2266b891 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 2f7fae60..dfe46ea9 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 bab39a27..0812a5b7 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 0ad9b611..6bd6b35f 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 5c2bf2d4..37388f35 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 6bd8b571..5279d7c5 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 8287ed5c..1516738c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/**************************************************************************
* winio.c *
* *