diff --git a/ChangeLog b/ChangeLog
index 714eaf1..55e3680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+0.0.8
+-----
+* Incorporate various upstream fixes/changes from 'nano'
+
 0.0.7
 -----
 * Underscores are considered part of words when moving forward/backward by words
diff --git a/configure.ac b/configure.ac
index f460555..375a270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with pinot; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-AC_INIT([pinot], [0.0.7], [phil@pgengler.net], [pinot])
+AC_INIT([pinot], [0.0.8], [phil@pgengler.net], [pinot])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/pinot.cpp])
 AC_CANONICAL_TARGET
diff --git a/doc/man/pinot.1 b/doc/man/pinot.1
index 041aa25..6c560fa 100644
--- a/doc/man/pinot.1
+++ b/doc/man/pinot.1
@@ -19,7 +19,7 @@
 .\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id: nano.1 4502 2010-04-14 21:55:39Z astyanax $
-.TH PINOT 1 "version 0.0.7" "August 3, 2014"
+.TH PINOT 1 "version 0.0.8" "July 2, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
diff --git a/doc/man/pinotrc.5 b/doc/man/pinotrc.5
index 581ebb3..6acbd58 100644
--- a/doc/man/pinotrc.5
+++ b/doc/man/pinotrc.5
@@ -19,7 +19,7 @@
 .\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id: pinotrc.5 4533 2011-02-24 02:14:30Z astyanax $
-.TH PINOTRC 5 "version 0.0.7" "August 3, 2014"
+.TH PINOTRC 5 "version 0.0.8" "July 2, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/texinfo/pinot.texi b/doc/texinfo/pinot.texi
index a05951e..e42a93f 100644
--- a/doc/texinfo/pinot.texi
+++ b/doc/texinfo/pinot.texi
@@ -6,8 +6,8 @@
 
 @smallbook
 @set EDITION 0.2
-@set VERSION 0.0.7
-@set UPDATED 11 August 2014
+@set VERSION 0.0.8
+@set UPDATED 2 July 2015
 
 @dircategory Editors
 @direntry
@@ -21,7 +21,7 @@
 @titlepage
 @title @code{pinot}
 @subtitle a small and friendly text editor.
-@subtitle version 0.0.7
+@subtitle version 0.0.8
 
 @author Phil Gengler
 @page