diff --git a/ChangeLog b/ChangeLog
index 3f8e00d48d37ea315285ccb47995d232f4bad50d..0d5c14a6afef092fdffd6edeba76f6274ec85473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-10 Chris Allegretta <chrisa@asty.org>
+        * text.c (do_enter): Only increment totsize by the auto-indented amount, size the previous line's size was
+	  already counted.  Fixes bug reported by Robert Spanjaard.
+
 2011-05-08 Chris Allegretta <chrisa@asty.org>
 	* doc/syntax/Makefile.am: Finally get around to sorting the syntax file list
 
diff --git a/src/text.c b/src/text.c
index 59459c212495270ff58a49519e24d8b276d1e204..ae434ee0e98bd116059602de6ad94920a1f0e71b 100644
--- a/src/text.c
+++ b/src/text.c
@@ -711,7 +711,7 @@ void do_enter(bool undoing)
 #ifndef NANO_TINY
     if (ISSET(AUTOINDENT)) {
 	strncpy(newnode->data, openfile->current->data, extra);
-	openfile->totsize += mbstrlen(newnode->data);
+	openfile->totsize += extra;
     }
 #endif
     null_at(&openfile->current->data, openfile->current_x);