diff --git a/NEWS b/NEWS
index 952fab9a..b53d909e 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@
       special versions for the old behavior
     * IMPORTANT: renamed Startup and Quit autocmd events to VimperatorEnter and
       VimperatorLeave respectively
+	* :buffers supports a filter now to only list buffers matching filter (vim incompatible,
+	  but consistent with other commands)
+	* Favicon support in many places
     * add 'Fullscreen' autocommmand
     * add :colorscheme
     * multibyte support for hints (thanks Xie&Tian)
diff --git a/content/completion.js b/content/completion.js
index ceea59a5..c400ca43 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -787,7 +787,7 @@ function Completion() //{{{
             // FIXME: liberator.has("tabs")
             let items = [];
             let xml = <table/>
-            filter = filter || "";
+            filter = (filter || "").toLowerCase();
 
             for (let [i, browser] in tabs.browsers)
             {
diff --git a/content/tabs.js b/content/tabs.js
index 2c4e5d62..de81293c 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -478,8 +478,8 @@ function Tabs() //{{{
 
         commands.add(["buffers", "files", "ls", "tabs"],
             "Show a list of all buffers",
-            function (args) { tabs.list(); },
-            { argCount: "0" });
+            function (args) { tabs.list(args.string); },
+            { argCount: "*" });
 
         commands.add(["quita[ll]", "qa[ll]"],
             "Quit " + config.name,
diff --git a/locale/en-US/tabs.txt b/locale/en-US/tabs.txt
index 4ecb73ad..3e3f38ae 100644
--- a/locale/en-US/tabs.txt
+++ b/locale/en-US/tabs.txt
@@ -9,10 +9,11 @@ result many buffer and tab commands are interchangeable.
 section:Listing{nbsp}tabs[listing-tabs]
 
 |B| |:tabs| |:ls| |:files| |:buffers|
-||:buffers|| +
+||:buffers [filter]|| +
 ||B||
 ________________________________________________________________________________
-Show a list of all buffers (=tabs).
+Show a list of buffers (=tabs) matching [filter]. Without [filter] list all
+tabs.
 ________________________________________________________________________________
 
 section:Opening{nbsp}tabs[listing-tabs]