diff --git a/ChangeLog b/ChangeLog
index ab6743c1..30fe1536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ CVS changes -
 	  Extra check in configure.in for initscr() in -lcurses (as
 	  PDcurses has no tgetent), some #ifdef PDCURSES statements
 	  in main().
+	- Changed web site and email to new nano-editor.org domain.
 - nano.c
   main()
 	- Added check for _POSIX_VDISABLE around term variable definition.
diff --git a/README b/README
index d813ab55..d665cda1 100644
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ How to compile and install nano
      
 Web Page
 
-	http://www.asty.org/nano
+	http://www.nano-editor.org
      
 Mailing List and Bug Reports
 
@@ -54,7 +54,7 @@ Mailing List and Bug Reports
 	with a subject of "subscribe", where <name> is the list you want to
 	subscribe to.
 	For general bug reports, send a description of the problem to
-	nano@asty.org or directly to the development list.
+	nano@nano-editor.org or directly to the development list.
 
 Current Status
 
diff --git a/faq.html b/faq.html
index ba120232..512430a1 100644
--- a/faq.html
+++ b/faq.html
@@ -118,7 +118,8 @@ will volunteer to maintain this FAQ someday, who knows...</font></blockquote>
 <a NAME="1.2"></a><font color="#330000">1.2. How do I contribute to it?</font></h2>
 
 <blockquote><font color="#330000">Your best bet is to send it to the nano
-email address, <a href="mailto:nano@asty.org">nano@asty.org</a> and if
+email address, <a
+href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if
 it is useful enough it will be included in future versions.</font></blockquote>
 
 <h2>
@@ -191,7 +192,7 @@ see what the latest and greatest version is.</font></blockquote>
 without having to download the program!</font></h2>
 
 <blockquote><font color="#330000">Jeez, demanding, aren't we?&nbsp;&nbsp;
-Okay, look <a href="http://www.asty.org/nano/dist/nano.1.html">here</a>.</font></blockquote>
+Okay, look <a href="http://www.nano-editor.org/dist/nano.1.html">here</a>.</font></blockquote>
 
 <hr WIDTH="100%">
 <h1>
@@ -205,13 +206,13 @@ nano.</font></h2>
 at the following fine web and ftp sites:</font>
 <ul>
 <li>
-<font color="#330000"><a href="http://www.asty.org/nano/dist">http://www.asty.org/nano/dist</a></font></li>
+<font color="#330000"><a href="http://www.nano-editor.org/dist">http://www.nano-editor.org/dist</a></font></li>
 
 <li>
 <font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist">http://www.ewtoo.org/~astyanax/nano/dist</a></font></li>
 
 <li>
-<font color="#330000"><a href="ftp://ftp.asty.org/pub/nano">ftp://ftp.asty.org/pub/nano</a></font></li>
+<font color="#330000"><a href="ftp://ftp.nano-editor.org/pub/nano">ftp://ftp.nano-editor.org/pub/nano</a></font></li>
 
 <li>
 <font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/">ftp://nano.sourceforge.net/pub/nano</a></font></li>
@@ -225,13 +226,13 @@ packages.</font></h2>
 <blockquote>
 <ul>
 <li>
-<font color="#330000"><a href="http://www.asty.org/nano/dist/RPMS">http://www.asty.org/nano/dist/RPMS</a></font></li>
+<font color="#330000"><a href="http://www.nano-editor.org/dist/RPMS">http://www.nano-editor.org/dist/RPMS</a></font></li>
 
 <li>
 <font color="#330000"><a href="http://www.ewtoo.org/~astyanax/nano/dist/RPMS">http://www.ewtoo.org/~astyanax/nano/dist/RPMS</a></font></li>
 
 <li>
-<font color="#330000"><a href="ftp://ftp.asty.org/pub/nano/RPMS">ftp://ftp.asty.org/pub/nano/RPMS</a></font></li>
+<font color="#330000"><a href="ftp://ftp.nano-editor.org/pub/nano/RPMS">ftp://ftp.nano-editor.org/pub/nano/RPMS</a></font></li>
 
 <li>
 <font color="#330000"><a href="ftp://nano.sourceforge.net/pub/nano/RPMS">ftp://nano.sourceforge.net/pub/nano/RPMS</a></font></li>
@@ -347,7 +348,7 @@ keystroke here>!</font></h2>
 <blockquote><font color="#330000">If you aren't trying some bizarre keystroke
 combination with some bizarre $TERM entry, chances are you have found a
 bug.&nbsp;&nbsp; You are welcome to submit it to the nano-devel list or
-to <a href="mailto:nano@asty.org">nano@asty.org</a>.</font></blockquote>
+to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>
 
 <h2>
 <a NAME="4.3"></a><font color="#330000">4.3. Nano crashes when I resize
@@ -406,7 +407,7 @@ my language!</font></h2>
 language to write one =-).&nbsp; Just grab the <b>nano.pot</b> file from
 the latest and greatest nano distribution (it's in the <b>po/</b> directory)
 and translate each line into your native language on the <b>msgstr</b>
-line.&nbsp; Then send it to the nano devel list or <a href="mailto:nano@asty.org">nano@asty.org</a>.</font></blockquote>
+line.&nbsp; Then send it to the nano devel list or <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</font></blockquote>
 
 <h2>
 <a NAME="5.2"></a><font color="#330000">5.2. I don't like the translation
@@ -426,14 +427,14 @@ or the devel list.</font></blockquote>
 of Pico?</font></h2>
 
 <blockquote><font color="#330000">There are many reasons to use nano instead
-of Pico, a more complete list can be found at the <a href="http://www.asty.org/nano">nano
+of Pico, a more complete list can be found at the <a href="http://www.nano-edior.org">nano
 homepage</a>.</font></blockquote>
 
 <h2>
 <a NAME="6.2"></a><font color="#330000">6.2. Why should I use Pico instead
 of nano?</font></h2>
 
-<blockquote>Again, check out the <a href="http://www.asty.org/nano">nano
+<blockquote>Again, check out the <a href="http://www.nano-editor.org">nano
 homepage</a> for a good summary of reasons.&nbsp; It really is a matter
 of personal preference as to which editor you should use.&nbsp; If you're
 the type of person who likes using the original version of a program, then
@@ -510,8 +511,8 @@ a given list:</font><font color="#330000"></font>
 team a big load of cash (or just a thank you).</font></h2>
 
 <blockquote><font color="#330000">That's fine.&nbsp; Send it <a href="mailto:nano-devel@lists.sourceforge.net">our
-way</a>!&nbsp; Better yet, fix a <a href="http://www.asty.org/nano/dist/BUGS">bug</a>
-in the program or implement a <a href="http://www.asty.org/nano/dist/TODO">cool
+way</a>!&nbsp; Better yet, fix a <a href="http://www.nano-editor.org/dist/BUGS">bug</a>
+in the program or implement a <a href="http://www.nano-editor.org/dist/TODO">cool
 feature</a> and send us that instead (though cash is fine too).</font></blockquote>
 
 <h2>
diff --git a/nano.1 b/nano.1
index dccfd8a3..d9c30235 100644
--- a/nano.1
+++ b/nano.1
@@ -94,13 +94,13 @@ Enable suspend ability.
 Places cursor at LINE on startup.
 .SH BUGS
 Please send any comments or bug reports to
-.B nano@asty.org.
+.B nano@nano-editor.org.
 The nano mailing list is available from
 .B nano-devel@lists.sourceforge.net.
 To subscribe, email to nano-devel-request@lists.sourceforge.net with a
 subject of "subscribe".
 .SH HOMEPAGE
-http://www.asty.org/nano
+http://www.nano-editor.org
 .SH AUTHOR
 Chris Allegretta <chrisa@asty.org>, et al.  This manual page was
 originally written by Jordi Mallach <jordi@sindominio.net>, for the Debian
diff --git a/nano.1.html b/nano.1.html
index a178fb7e..7fa0aa05 100644
--- a/nano.1.html
+++ b/nano.1.html
@@ -132,7 +132,7 @@ Places cursor at LINE on startup.
 <H2>BUGS</H2>
 
 Please send any comments or bug reports to
-<B><A HREF="mailto:nano@asty.org">nano@asty.org</A>.</B>
+<B><A HREF="mailto:nano@nano-editor.org">nano@nano-editor.org</A>.</B>
 
 The nano mailing list is available from
 <B><A HREF="mailto:nano-devel@lists.sourceforge.net">nano-devel@lists.sourceforge.net</A>.</B>
@@ -142,7 +142,7 @@ subject of &quot;subscribe&quot;.
 <A NAME="lbAG">&nbsp;</A>
 <H2>HOMEPAGE</H2>
 
-<A HREF="http://www.asty.org/nano">http://www.asty.org/nano</A>
+<A HREF="http://www.nano-editor.org">http://www.nano-editor.org</A>
 <A NAME="lbAH">&nbsp;</A>
 <H2>AUTHOR</H2>
 
diff --git a/nano.c b/nano.c
index 4b34d6f4..c417f5fb 100644
--- a/nano.c
+++ b/nano.c
@@ -399,7 +399,7 @@ void version(void)
 {
     printf(_(" nano version %s by Chris Allegretta (compiled %s, %s)\n"),
 	   VERSION, __TIME__, __DATE__);
-    printf(_(" Email: nano@asty.org	Web: http://www.asty.org/nano\n"));
+    printf(_(" Email: nano@nano-editor.org	Web: http://www.nano-editor.org\n"));
 }
 
 filestruct *make_new_node(filestruct * prevnode)
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index e0b912f9..0b946d94 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -168,7 +168,7 @@ Usage: nano [option] +LINE <file>\n\
   {" -z \t\tEnable suspend\n", 135},
   {" +LINE\t\tStart at line number LINE\n", 136},
   {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 137},
-  {" Email: nano@asty.org\tWeb: http://www.asty.org/nano\n", 138},
+  {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n", 138},
   {"Mark Set", 139},
   {"Mark UNset", 140},
   {"check_wrap called with inptr->data=\"%s\"\n", 141},
diff --git a/po/de.gmo b/po/de.gmo
index def36654..5da6b715 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 22c1bc35..41cc6549 100644
--- a/po/de.po
+++ b/po/de.po
@@ -628,8 +628,8 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano Version %s von Chris Allegretta (compiliert um %s, %s)\n"
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
-msgstr " Email: nano@asty.org\tWWW: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
+msgstr " Email: nano@nano-editor.org\tWWW: http://www.nano-editor.org\n"
 
 #: nano.c:437
 msgid "Mark Set"
diff --git a/po/es.gmo b/po/es.gmo
index d3b867a3..caf36bd8 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index f6c4a5ab..5424139f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -624,8 +624,8 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano versión %s por Chris Allegretta (compilado %s, %s)\n"
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
-msgstr " Correo-e: nano@asty.org\tWeb: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
+msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
 
 #: nano.c:437
 msgid "Mark Set"
diff --git a/po/fi.gmo b/po/fi.gmo
index 690f91d2..bbb9c9ed 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index f49297c8..579bd6c0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -624,8 +624,8 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano, versio %s. Chris Allegretta (käännetty %s, %s)\n"
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
-msgstr " Maili: nano@asty.org\tNetti: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
+msgstr " Maili: nano@nano-editor.org\tNetti: http://www.nano-editor.org\n"
 
 #: nano.c:437
 msgid "Mark Set"
diff --git a/po/id.gmo b/po/id.gmo
index 3e512769..4e7b9ae5 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 11e5cd7c..19fa4089 100644
--- a/po/id.po
+++ b/po/id.po
@@ -623,8 +623,8 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr "nano versi %s oleh Chris Allegretta (compiled %s, %s)\n"
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
-msgstr "Email: nano@asty.org    Web: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
+msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
 
 #: nano.c:437
 msgid "Mark Set"
diff --git a/po/it.gmo b/po/it.gmo
index f8672868..fa7d65c0 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 5f4b678b..8a77116f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -608,8 +608,8 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr " nano versione %s di Chris Allegretta (compilato %s, %s\n"
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
-msgstr "Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
+msgstr "Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
 
 #: nano.c:437
 msgid "Mark Set"
diff --git a/po/nano.pot b/po/nano.pot
index be1a0a53..da1198d3 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-21 00:31-0400\n"
+"POT-Creation-Date: 2000-09-26 23:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -598,7 +598,7 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n"
 msgstr ""
 
 #: nano.c:402
-msgid " Email: nano@asty.org\tWeb: http://www.asty.org/nano\n"
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n"
 msgstr ""
 
 #: nano.c:437