diff --git a/ChangeLog b/ChangeLog
index 834d7aa526ed97ffab263da27777ddb60414a151..4f45366f3d4c0c67210ec9ea825c6ce670ec08d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+nano 0.9.21 - 11/23/2000
 - AUTHORS
 	- Added Rocco Corsi.
 - nano.c:
diff --git a/configure b/configure
index 467b751cad634cd8e090fdfafc3f4b115b5ade9d..c8f4ba55ec0a3a8ba90196b58f8defed8712d154 100755
--- a/configure
+++ b/configure
@@ -710,7 +710,7 @@ fi
 
 PACKAGE=nano
 
-VERSION=0.9.20-cvs
+VERSION=0.9.21
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index cb232f5fbaf7822b42f9c29011a0ac8d7960cd28..69a4393d33595a2dbd96b81c4de06d0bfd1b1402 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(nano.c)
-AM_INIT_AUTOMAKE(nano, 0.9.20-cvs)
+AM_INIT_AUTOMAKE(nano, 0.9.21)
 AM_CONFIG_HEADER(config.h:config.h.in)
 ALL_LINGUAS="es de fr it id fi"
 
diff --git a/faq.html b/faq.html
index 65c3c368c8065c3619d4dd9b17667418045ef0c3..4347e220cfe7510f7152791fe0a6472408405017 100644
--- a/faq.html
+++ b/faq.html
@@ -187,7 +187,7 @@ nano was developed).</font></blockquote>
 of nano?</font></h2>
 
 <blockquote><font color="#330000">The current version of nano *should*
-be 0.9.20.&nbsp; Of course you should always check the nano hompage to
+be 0.9.21.&nbsp; Of course you should always check the nano hompage to
 see what the latest and greatest version is.</font></blockquote>
 
 <h2>
@@ -376,7 +376,7 @@ will get the same shortcuts at the bottom as Pico.</font></blockquote>
 string, the string I last searched for is already in front of my
 cursor!  !What happened?!</font></h2>
 
-<blockquote><font color="#330000">In nano version 0.9.20, the default is
+<blockquote><font color="#330000">In nano version 0.9.21, the default is
 to have a completely consistent user interface across all user input
 functions.  This means that regardless of whether you're being asked for
 a filename to insert or write, or a string to search for, the
diff --git a/po/de.gmo b/po/de.gmo
index 1a58b9c9d7f950705082d7dde046e64f33d0946b..0dde3cd4fa2248a4830e78ff79128f9e6287caeb 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 5eccae9d05ba3e077e1466e42d8f71f78176d6bd..b4210b363d28cadcaf2de0456587b8640e2bee21 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.17\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-09-09 11:55+0200\n"
 "Last-Translator: Florian König <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\n"
@@ -806,41 +806,41 @@ msgstr "%d Ersetzungen vorgenommen"
 msgid "Replaced 1 occurence"
 msgstr "1 Ersetzung vorgenommen"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Ersetzen?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
diff --git a/po/es.gmo b/po/es.gmo
index da92b1783afd251327fbc14e3ea799a2971f1ae6..bcadaab57adaa296ba0ec681be08cc41c9f4ab4d 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index e4021c701617e0202d389d08f72db12ef7f9e22a..0ef46dc868f433678acb80ef075a239cb2e309b1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19+CVS\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-11-01 17:55+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -798,41 +798,41 @@ msgstr "%d ocurrencias reemplazadas"
 msgid "Replaced 1 occurence"
 msgstr "1 ocurrencia reemplazada"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Reemplazar esta instancia?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr "Fallo en reemplazar: subexpresión desconocida!"
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Reemplazar con"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Introduce número de línea"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Abortado"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Sólo hay %d líneas, saltando hasta la última"
diff --git a/po/fi.gmo b/po/fi.gmo
index 7543b593095f60ae21dfc74ccf044e3261d2faf9..18dde88286489c956eb1b767d422c36fd5c8a3f3 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index c817653d3fd68f61dc53216903d013c9e93432d5..0afc8d8f470144eeecf93a76508f52e5028f9994 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-06-21 23:08+03:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -801,41 +801,41 @@ msgstr "%d kohtaa korvattu"
 msgid "Replaced 1 occurence"
 msgstr "1 kohta korvattu"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Keskeytetty"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Vain %d riviä olemassa, siirrytään viimeiselle riville"
diff --git a/po/fr.po b/po/fr.po
index 1902bbd56bc729712e7f3bca415bd66ba2aa6f40..5b90a1a5a67605b3f4e2b54fab6ece4d5ac84917 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-07-09 01:32+0100\n"
 "Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -821,41 +821,41 @@ msgstr "%d occurences remplac
 msgid "Replaced 1 occurence"
 msgstr "1 occurence remplacée"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Rempacer par"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Annulé"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
diff --git a/po/id.gmo b/po/id.gmo
index 6cb9c5aa791eb114ad8406e49da1c3fca7f219ec..42b452cc2bc548f08940e3b89325c3a0ca77a18d 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 9cf002b5b8be11c200591de16238be130d007c98..284ee0d74f5a6b295ff7e1874347ecaeca0e3292 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-0.9.10\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-06-08 20:56+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -800,41 +800,41 @@ msgstr "%d tempat terganti"
 msgid "Replaced 1 occurence"
 msgstr "Terganti 1 tempat"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Batalkan penggantian"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Ganti dengan"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Dibatalkan"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
diff --git a/po/it.gmo b/po/it.gmo
index 3b38e2cae2d61caf51eba66fa3b9649a6567c036..0bdb6e02078cf6d216e71e37be956d394ef6d3bb 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 18d313195258d4886f5935cc4661a452b26f2f34..0ce543fe096484e1f277e5790a8753d19be946da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2000-11-21 01:23-0500\n"
+"POT-Creation-Date: 2000-11-22 20:20-0500\n"
 "PO-Revision-Date: 2000-03-03 04:57+0100\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -787,41 +787,41 @@ msgstr "Sostituite %d occorrenze"
 msgid "Replaced 1 occurence"
 msgstr "Sostituita 1 occorrenza"
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:479 search.c:575 search.c:591
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"
 
-#: search.c:522
+#: search.c:525
 msgid "Replace this instance?"
 msgstr "Sostituisci questa istanza?"
 
-#: search.c:530
+#: search.c:533
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:613
+#: search.c:616
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"
 
-#: search.c:617 search.c:621
+#: search.c:620 search.c:624
 msgid "Replace with"
 msgstr "Sostituisci con"
 
 #. Ask for it
-#: search.c:656
+#: search.c:659
 msgid "Enter line number"
 msgstr "Inserire numero linea"
 
-#: search.c:658
+#: search.c:661
 msgid "Aborted"
 msgstr "Operazione fallita"
 
-#: search.c:678
+#: search.c:681
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"
 
-#: search.c:683
+#: search.c:686
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Solo %d linee disponibili, vai all'ultima"