diff --git a/ChangeLog b/ChangeLog
index 54f23f9e8..5a2f1c301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
    Update 'Contributing to this document' section.
  * doc/geany.1.in:
    Update for -g and -p options.
+ * data/autocomplete.conf:
+   Add %cursor% for default 'else' completion.
+   Add space before while for 'do' completion.
 
 
 2007-08-09  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/data/autocomplete.conf b/data/autocomplete.conf
index 116142115..a2efecbe4 100644
--- a/data/autocomplete.conf
+++ b/data/autocomplete.conf
@@ -14,10 +14,10 @@
 # Default is used for all filetypes and keys can be overwritten by [filetype] sections
 [Default]
 if=if (%cursor%)%brace_open%\n%brace_close%
-else=else%brace_open%\n%brace_close%
+else=else%brace_open%%cursor%\n%brace_close%
 for=for (i = 0; i < %cursor%; i++)%brace_open%\n%brace_close%
 while=while (%cursor%)%brace_open%\n%brace_close%
-do=do%brace_open%%cursor%\n%brace_close%while ()
+do=do%brace_open%%cursor%\n%brace_close% while ()
 switch=switch (%cursor%)%brace_open%case : break;\n%ws%default: \n%brace_close%
 try=try%block_cursor%catch ()%block%