diff --git a/ChangeLog b/ChangeLog
index 891c32d8..adec0124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
+2015-02-15  Benno Schulenberg  <bensberg@justemail.net>
+	* src/file.c (do_lockfile): Also show the name of the affected file
+	when finding a lock file, for when many files are opened at once.
+
 2015-02-09  Chris Allegretta <chrisa@asty.org>
 	* nano.spec.in: Add dependency on texinfo, docdir files for
 	RPM file creation.
 
 GNU nano 2.3.99pre2 - 2015.02.06
-2015-02-03 Alex Henrie <alexhenrie24@gmail.com>
+2015-02-03  Alex Henrie  <alexhenrie24@gmail.com>
 	* src/cut.c (do_cut_text): Make sure to set modified even when
 	using --enable-tiny.
 
diff --git a/src/files.c b/src/files.c
index 20d16dc7..5885358a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -293,8 +293,8 @@ int do_lockfile(const char *filename)
         fprintf(stderr, "user which created this lock file should be %s\n",
                 lockuser);
 #endif
-        sprintf(promptstr, _("File is being edited (by %s, PID %d, user %s); continue?"),
-                              lockprog, lockpid, lockuser);
+        sprintf(promptstr, _("File %s is being edited (by %s, PID %d, user %s); continue?"),
+                              filename, lockprog, lockpid, lockuser);
         ans = do_yesno_prompt(FALSE, promptstr);
         if (ans < 1) {
             blank_statusbar();