diff --git a/ChangeLog b/ChangeLog
index a5f94416b591a9425ec26d6e6f664c46b9c9495d..63fb5a5c2e30033937776f468cac7f66bb24ff78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+GNU nano 1.3.9 - 2005.10.23
 - General:
 	- Miscellaneous comment fixes. (DLR)
 	- More int -> bool conversions. (DLR)
diff --git a/NEWS b/NEWS
index 916b49dd003a93c58839686d515feb687dd65315..1072a836c887f20bba4ea9368e54879302729d86 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+2005.10.23 - GNU nano 1.3.9 breaks through the wall.  This release
+		includes major enhancements as well as bugfixes.  The
+		enhancements include better handling of invalid UTF-8,
+		expansion of the word count option to also count lines
+		and characters in the file or selection, more efficient
+		screen update routines, a readded -K/--rebindkeypad
+		option to work around numeric keypad problems on
+		terminals that don't show the usual NumLock glitch, a
+		new -W/--wordbounds option to properly detect words
+		containing punctuation when moving among them, and
+		massive improvements to the color code such as handling
+		of unspecified foreground colors, more efficient memory
+		usage for color regexes, and new reserved syntaxes
+		"default" and "none".  The bugfixes include fixes for
+		the rewritten history code, fixes for potential line
+		numbering problems on 64-bit platforms, fixes for a few
+		long-standing minor display problems, a fix for erroneous
+		hangups occurring while waiting for input, and a fix for
+		a segfault when displaying certain overly long lines.
+		Have fun with it.
+
 2005.06.30 - GNU nano 1.3.8 floats at its own level.  This release
 		contains several new features.  Among other things, you
 		can now move to a specified column number as well as
diff --git a/configure.ac b/configure.ac
index 4433dcf322b1cfb04f364d090fb340db15177640..4a48d15ad56ea4b6e2286915ec839e50fbddceb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.3.8-cvs], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.3.9], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
diff --git a/doc/faq.html b/doc/faq.html
index 6ba99e7f56fd05aa3886c20b2362e54f0b794666..8f582b57bd664724cc112e90319b1d3426d19180 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -81,7 +81,7 @@
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.3.8. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 1.3.9. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
 <blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.3/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">