diff --git a/general.ent b/general.ent
index bffa4123ce..e25d3d1aca 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bac5e192a7..ca7fd68b42 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>November, 27th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to nano-2.9.0, fixes
+          <ulink url="&blfs-ticket-root;10044">#10044</ulink>.</para>
+	</listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 26th, 2017</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 1365902a38..3d3ae3ba80 100644
--- a/packages.ent
+++ b/packages.ent
@@ -70,7 +70,7 @@
 <!ENTITY emacs-version                "25.3">
 <!ENTITY joe-version                  "4.5">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "2.8.7">
+<!ENTITY nano-version                 "2.9.0">
 <!ENTITY vim-version                  "8.0.586">
 <!ENTITY vim-majmin                   "80">
 
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 526fced3c2..2016429238 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!-- Note minor version in URL -->
-  <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v2.8/nano-&nano-version;.tar.xz">
+  <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v2.9/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "733b3f80a0a2f44fb25de6c6d3a583cf">
+  <!ENTITY nano-md5sum        "a7f0a70fea21431745aa07ee2c5c8d3a">
   <!ENTITY nano-size          "1.4 MB">
-  <!ENTITY nano-buildsize     "16 MB">
+  <!ENTITY nano-buildsize     "17 MB">
   <!ENTITY nano-time          "0.2 SBU">
 ]>
 
@@ -166,6 +166,16 @@ set regexp
 set smooth
 set suspend</literal></screen>
 
+      <para>You probably want to create the directory
+        <filename class="directory">$HOME/.local/share/nano</filename>.
+        This is where <application>Nano</application> will store search
+        and position log files. Required only if you have either historylog
+        and/or positionlog enabled. When using those settings in a system-wide
+        configuration, you may want to update
+        <filename class="directory">/etc/skel</filename> to make the
+        directory available for all (new) users.
+      </para>
+
       <para>
         Another example is the <filename>nanorc.sample</filename> file
         in the installed documentation directory.