diff --git a/ChangeLog b/ChangeLog
index f664160561addcce075759795f621038952c8513..ccf5216c48068764c15edb1f9a9bc82448c71758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	* src/files.c (do_lockfile): Avoid printing a wrong PID on the status
 	bar due to treating serialized PID bytes as signed integers.  This
 	addresses https://bugzilla.redhat.com/1186384 reported by Don Swaner.
+	* src/files.c (write_lockfile): Do not trim the nano version number
+	-- snprintf() counts the trailing zero into the size limit.
 
 2015-02-01  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (do_credits): Add a general entry for all translators.
diff --git a/src/files.c b/src/files.c
index 43b8c13d65d7dcec2c1cc96eac1ca1298b38ca2a..20d16dc72267bfeb58f5a25c139b138a6e99d38c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -200,7 +200,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     lockdata[1] = 0x30;
     lockdata[24] = mypid % 256;
     lockdata[25] = mypid / 256;
-    snprintf(&lockdata[2], 10, "nano %s", VERSION);
+    snprintf(&lockdata[2], 11, "nano %s", VERSION);
     strncpy(&lockdata[28], mypwuid->pw_name, 16);
     strncpy(&lockdata[68], myhostname, 31);
     strncpy(&lockdata[108], origfilename, 768);