diff --git a/NEWS b/NEWS
index 6ad75016..2089deda 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 2007-xx-xx:
 	* version 0.6
 	* THIS VERSION ONLY WORKS WITH FIREFOX 3.0
+	* new :winclose command
 	* :q doesn't close the whole browser, if there are more than one windows
 	* new gb and gB mappings to repeat the last :buffer[!] command,
 	* :ls, :history and :bmarks output is now hyperlinked
diff --git a/TODO b/TODO
index c35c27b9..f7b046f1 100644
--- a/TODO
+++ b/TODO
@@ -15,7 +15,6 @@ BUGS:
 - :noremap does not work fully
 - pvh option not working
 - searching backwards incrementally does not work i.e. with 'incsearch' set
-- :q should not close firefox, if there are more than 1 window
 
 FEATURES:
 9 :command for new commands
@@ -25,6 +24,7 @@ FEATURES:
 7 use ctrl-n/p in insert mode for word completion
 7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
 7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
+7 :set! should also set about:config options (with autocomplete)
 6 use '' to jump between marks like vim
 6 downloading of links to filesystem (:save <filename>)
 6 autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, PageLoaded, any more?)
@@ -39,7 +39,6 @@ FEATURES:
 4 Support multiple top-level windows?
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
-3 :set! should also set about:config options (with autocomplete)
 - many other ideas are listed in the wiki
 
 RANDOM IDEAS:
diff --git a/content/commands.js b/content/commands.js
index 2a18792b..bec5e067 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1948,6 +1948,16 @@ function Commands() //{{{
             short_help: "Show help for normal mode commands"
         }
     ));
+    addDefaultCommand(new Command(["winc[lose]", "wc[lose]"],
+        function(args)
+        {
+            window.close();
+        },
+        {
+            usage: ["winc[ose] [url] [, url]"],
+            short_help: "Close window",
+        }
+    ));
     addDefaultCommand(new Command(["wino[pen]", "wo[pen]", "wine[dit]"],
         function(args)
         {
@@ -1959,7 +1969,7 @@ function Commands() //{{{
         {
             usage: ["wino[pen] [url] [, url]"],
             short_help: "Open one or more URLs in a new window",
-            help: "NOTE: Multiple windows are not really supported by Vimperator, use at your own risk!"
+            help: "Like <code class=\"command\">:open</code> but open URLs in a new window.<br/>"
         }
     ));
     addDefaultCommand(new Command(["wqa[ll]", "wq", "xa[ll]"],