diff --git a/ChangeLog b/ChangeLog
index 055d3d1617419b3168191e8348fec6c6856bba10..f494b04896d306c7e9d932af901bf2d5c3538aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	* src/nano.c (do_mouse): Put a common statement outside of then/else.
 	* src/Makefile.am: Remove -I m4; it is needed only at the top level.
 	* Makefile.am: Trim the contents of EXTRA_DIST to what is required.
+	* doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Update
+	the docs for the changed location of nano's search history.
 
 2014-06-14  Mark Majeres  <mark@engine12.com>
 	* src/nano.h, src/text.c (undo_cut, update_undo): When undoing a
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 48be089dd223c119821bf914d297ee004a979602..51d4475871cb55cb3869d5c13ae6ff7fc05aee15 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -74,7 +74,7 @@ Enable multiple file buffers, if available.
 Enable vim-style file locking when editing files.
 .TP
 .B \-H (\-\-historylog)
-Log search and replace strings to \fI~/.nano_history\fP, so they can be
+Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
 retrieved in later sessions, if \fInanorc\fP support is available.
 .TP
 .B \-I (\-\-ignorercfiles)
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 78880249bb0ae78315bcd2408c47f94291f642ee..9ed3ee9731b211934efe987f7a7149fb4e36b8b7 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -100,7 +100,7 @@ in the two help lines at the bottom of the screen.
 See \fBset titlecolor\fR for more details.
 .TP
 .B set/unset historylog
-Enable the use of \fB~/.nano_history\fP for saving and reading
+Enable the use of \fB~/.nano/search_history\fP for saving and reading
 search/replace strings.
 .TP
 .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index a494a8b39167ed4e8deaa6d21a9c38aae78d17ea..b688142f179aef8ab0c19dc2e96686b3dff0daa7 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -154,7 +154,7 @@ Enable multiple file buffers, if available.
 Enable vim-style file locking when editing files.
 
 @item -H, --historylog
-Log search and replace strings to ~/.nano_history, so they can be
+Log search and replace strings to ~/.nano/search_history, so they can be
 retrieved in later sessions, if nanorc support is available.
 
 @item -I, --ignorercfiles
@@ -521,7 +521,7 @@ toggles the -$ (@code{--softwrap}) command line option.
 
 The nanorc files contain the default settings for @code{nano}.  They
 should be in Unix format, not in DOS or Mac format.  During startup,
-@code{nano} will first read the system-wide settings, from /etc/nanorc,
+@code{nano} will first read the system-wide settings, from SYSCONFDIR/nanorc,
 and then the user-specific settings, from ~/.nanorc.
 
 A nanorc file accepts a series of "set" and "unset" commands, which can
@@ -606,7 +606,8 @@ in the two help lines at the bottom of the screen.
 See "set titlecolor" for more details.
 
 @item set/unset historylog
-Enable ~/.nano_history for saving and reading search/replace strings.
+Enable the use of ~/.nano/search_history for saving and reading
+search/replace strings.
 
 @item set keycolor fgcolor,bgcolor
 Specify the color combination to use for the shortcut key combos