diff --git a/ChangeLog b/ChangeLog
index c0bedf06..ef91e0fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+GNU nano 1.3.6 - 2005.03.20
- General:
- More int -> bool conversions. (DLR and David Benbennick)
- Overhaul the cutting and uncutting routines to use the
diff --git a/NEWS b/NEWS
index 4fb12976..a4ec9e52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+2005.03.20 - GNU nano 1.3.6 "shout it from the rooftops" is released.
+ This release finally includes the long-awaited support
+ for UTF-8. Other new features include the ability to
+ insert UTF-8 characters using verbatim input; the
+ ability to delete all text from the cursor position to
+ the end of the file via ^W^X as (patched) Pico does;
+ improvements to input and output so that pasted text
+ displays faster, improvements to the statusbar prompt so
+ that more edit window shortcuts, including verbatim
+ input and previous/next word search, work in it; a new
+ option to allow using the formerly always-blank second
+ line of the screen as part of the edit window; and the
+ ability to refresh the help browser and file browser
+ windows via Ctrl-L. Notable bug fixes include a fix for
+ a segfault when using full justify, and a fix for the
+ long-standing bug where nano would keep running if the
+ terminal it was in died unexpectedly. Enjoy.
+
2004.11.22 - GNU nano 1.3.5 hurls itself forward. New features in this
release include the ability to replace only marked text
when the mark is on, improvements to smooth scrolling so
diff --git a/configure.ac b/configure.ac
index eab13e99..2a791309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
#
# $Id$
-AC_INIT([GNU nano], [1.3.5-cvs], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.3.6], [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 99d8f7b8..bb558aed 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -80,7 +80,7 @@
1.5. Why the name change from TIP?
On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", 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).
1.6. What is the current version of nano?
-The current version of nano *should* be 1.3.5. Of course you should always check the nano homepage to see what the latest and greatest version is.
+The current version of nano *should* be 1.3.6. Of course you should always check the nano homepage to see what the latest and greatest version is.
1.7. I want to read the man page without having to download the program!
Jeez, demanding, aren't we? Okay, look here.