diff --git a/BUGS b/BUGS
index 2533e62a..9db3c859 100644
--- a/BUGS
+++ b/BUGS
@@ -121,7 +121,4 @@
 
 ** Open BUGS **
 
-Informal note - when using marked write to file, the number of lines
-written is off by one.  Delete this message when fixed.
-
 $Id$
diff --git a/ChangeLog b/ChangeLog
index 9f8ab3c1..124bceeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,8 @@ Cvs code -
   write_file()
 	- New arg, nonamechange, means whether or not to update the
 	  current filename after writing the file out.
+	- Increment lineswritten when the very last line isn't null.
+	  Fixes off by one count when writing selection to file.
 - global.c:
 	- Updated some of the lists for the "Goto Directory" code (Rocco)
 - move.c:
diff --git a/files.c b/files.c
index f37d7a79..62dd5f72 100644
--- a/files.c
+++ b/files.c
@@ -448,6 +448,7 @@ int write_file(char *name, int tmp, int append, int nonamechange)
 	    return -1;
 	} else if (size > 0) {
 	    size = write(fd, "\n", 1);
+	    lineswritten++;
 	    if (size == -1) {
 		statusbar(_("Could not open file for writing: %s"),
 			  strerror(errno));