diff --git a/ChangeLog b/ChangeLog
index 16c31bcff624cd2191fe5afb35abdefe9c18ab11..0191d3d743a5e89a7b4c378e15806f23e4342bec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+GNU nano 1.3.8 - 2005.06.30
 - General:
 	- Miscellaneous comment fixes. (DLR)
 	- Various #include fixes.  Since proto.h includes nano.h, only
diff --git a/NEWS b/NEWS
index 11861b28a12bbe213669288351dc5ccdae46935b..916b49dd003a93c58839686d515feb687dd65315 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+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
+		line number within a file, file backups saved in a
+		backup directory will have unique names, the search and
+		replace history routines should work more consistently,
+		you can get a word count by pressing Meta-D at the edit
+		window, and there's a new -E/--tabstospaces option to
+		convert all typed tabs to spaces (--backupdir's short
+		option has been changed to -C).  In terms of bugfixes,
+		this release contains fixes for minor problems with
+		screen updates, UTF-8 display, and flow control; a fix
+		for a segfault when displaying some lines ending with
+		tabs; better handling of constant cursor position
+		display; improved color parsing in the rcfile; and
+		support for the "Regexp" toggle in tiny mode
+		(-R/--regexp is gone, and --restricted's short option
+		has been changed to -R), among other things.  Enjoy.
+
 2005.04.10 - GNU nano 1.3.7 claws its way to the top.  This release
 		mostly contains bugfixes for the massive amount of new
 		code in 1.3.6.  Among other things, nano builds with
diff --git a/configure.ac b/configure.ac
index 2d6fc5f43343e3ae7aa586d3de39630c4b193ac1..503280d556a4fc7e7d035eb4aea30d830fd1c174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.3.7-cvs], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [1.3.8], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE