diff --git a/ChangeLog b/ChangeLog
index b0fdf24b..21912e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -315,6 +315,10 @@ CVS code -
   get_history_completion()
 	- Make parameters const where possible. (DLR)
 - text.c:
+  do_tab()
+	- Make sure that we insert the correct number of spaces if the
+	  TABS_TO_SPACES flag is set and placewewant is greater than the
+	  current column position of the cursor. (DLR)
   do_enter()
 	- Don't update the edit window until we set placewewant. (DLR)
   break_line()
diff --git a/src/text.c b/src/text.c
index 8b8bb24f..30e62182 100644
--- a/src/text.c
+++ b/src/text.c
@@ -163,7 +163,7 @@ void do_tab(void)
 #ifndef NANO_SMALL
     if (ISSET(TABS_TO_SPACES)) {
 	char *output;
-	size_t output_len = 0, new_pww = openfile->placewewant;
+	size_t output_len = 0, new_pww = xplustabs();
 
 	do {
 	    new_pww++;