diff --git a/common/content/ui.js b/common/content/ui.js
index 53b41354..34158346 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -812,7 +812,7 @@ function CommandLine() //{{{
     // TODO: these belong in ui.js
     options.add(["complete", "cpt"],
         "Items which are completed at the :[tab]open prompt",
-        "charlist", "sfl",
+        "charlist", "slf",
         {
             completer: function (context) [k for each (k in completion.urlCompleters)],
             validator: Option.validateCompleter
diff --git a/vimperator/Donors b/vimperator/Donors
index fdb755b5..fed85fca 100644
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -2,6 +2,7 @@ Continuous donations:
 * Daniel Bainton (web hosting)
 
 2009:
+* Máté Nagy
 * Jessica Pavlin
 * David Wolfe
 * Sigurdur Finnsson
diff --git a/vimperator/Makefile b/vimperator/Makefile
index 165a4b0f..96dcb0e2 100644
--- a/vimperator/Makefile
+++ b/vimperator/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 2.1a1pre
+VERSION       = 2.1
 NAME          = vimperator
 
 include ../common/Makefile.common
diff --git a/vimperator/NEWS b/vimperator/NEWS
index a30cf99e..fb71518d 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,5 +1,6 @@
-2009-XX-XX:
+2009-05-21:
     * version 2.1
+    * IMPORTANT: Default value of 'complete' has been changed from 'sfl' to 'slf'
     * massively speed up :open completions
     * TabMixPlus (and other tab extensions) should work much better now
       together with Vimperator unless you :set guioptions+=[nN]
@@ -10,12 +11,12 @@
     * add 'encoding'
     * add 'hintinputs'
     * add :silent
-    * add $MY_VIMPERATORRC // TODO: I still don't like this --mst
-                               You're yet to explain why... --djk
+    * add $MY_VIMPERATORRC
     * add ' and " local marks
     * add "w" and "W" Normal mode mappings for symmetry with o/O and t/T
     * add :messclear
     * add 'maxitems'
+    * as usual many small bug fixes
 
 2009-03-28:
     * version 2.0
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 07578854..ae7601af 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -224,7 +224,7 @@ ____
 
 
 |\'cpt'| |\'complete'|
-||'complete' 'cpt'|| charlist (default: sfl)
+||'complete' 'cpt'|| charlist (default: slf)
 ____
 Items which are completed at the [c]:[tab]open[c] prompt. Available items:
 
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index 25fa0ea7..ab1d3fe8 100644
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -224,7 +224,7 @@ ____
 
 
 |\'cpt'| |\'complete'|
-||'complete' 'cpt'|| charlist (default: sfl)
+||'complete' 'cpt'|| charlist (default: slf)
 ____
 Items which are completed at the [c]:[tab]open[c] prompt. Available items: