diff --git a/ChangeLog b/ChangeLog
index 8cdbb70839da87b49d5d569ade1207296ef377db..193dba82de12b8667e12da3085c96484639e90f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,7 +95,9 @@ CVS code -
 	  characters on the line is exactly one over the limit. (David
 	  Benbennick)
 	- Restore the previous wrapping point behavior (pre 1.1.10)
-	  (David Benbennick, fixes by DLR).
+	  (David Benbennick).  Minor fix by DLR to prevent spaces from
+	  being added to the ends of lines ending in spaces or lines
+	  ending in tabs (the latter case found by David Benbennick).
   do_alt_speller()
   	- Readd DLR's fix to preserve marking when using the alternate
   	  spell checker; it was accidentally dropped. (David
diff --git a/nano.c b/nano.c
index 0cfdb709f16f00ecec5a44da13db5df4b88effc1..fe7b767bc48456c1242ff990bde81c980fcea754 100644
--- a/nano.c
+++ b/nano.c
@@ -1510,9 +1510,9 @@ int do_wrap(filestruct *inptr)
     if (wrapping) {
 	/* In this case, totsize increases by 1 since we add a space
 	 * between after_break and wrap_line.  If the line already ends
-	 * in a space, we don't add a space and decrement totsize to
-	 * account for that. */
-	if (newline[strlen(newline) - 1] != ' ')
+	 * in a tab or a space, we don't add a space and decrement
+	 * totsize to account for that. */
+	if (newline[strlen(newline) - 1] != '\t' && newline[strlen(newline) - 1] != ' ')
 	    strcat(newline, " ");
 	else
 	    totsize--;