diff --git a/ChangeLog b/ChangeLog
index 54aaf997..3477fbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (write_lockfile, do_lockfile) - Fix a typo reported
+	by Jean-Philippe Guérard and inconsistent spelling of "lock file"
+	reported by myself on nano-devel in March 2013.
+
 2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
 	* src/help.c (do_help_void) - Call the help browser with the correct
 	refresher for afterwards.  This solves a bug reported by myself on
diff --git a/src/files.c b/src/files.c
index 3c18662d..914c6e28 100644
--- a/src/files.c
+++ b/src/files.c
@@ -140,7 +140,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     mypid = getpid();
 
     if (gethostname(myhostname, 31) < 0) {
-       statusbar(_("Couldn't determine hosttname for lock file: %s"), strerror(errno));
+       statusbar(_("Couldn't determine hostname for lock file: %s"), strerror(errno));
        return -1;
     }
 
@@ -268,7 +268,7 @@ int do_lockfile(const char *filename)
         char *promptstr = (char *) nmalloc(128);
         int ans;
         if ((lockfd = open(lockfilename, O_RDONLY)) < 0) {
-            statusbar(_("Error opening lockfile %s: %s"),
+            statusbar(_("Error opening lock file %s: %s"),
                       lockfilename, strerror(errno));
             return -1;
         }
@@ -278,7 +278,7 @@ int do_lockfile(const char *filename)
         } while (readtot < 8192 && readamt > 0);
 
         if (readtot < 48) {
-            statusbar(_("Error reading lockfile %s: Not enough data read"),
+            statusbar(_("Error reading lock file %s: Not enough data read"),
                       lockfilename);
             return -1;
         }