diff --git a/vimperator/TODO b/vimperator/TODO
index d6f0d711..f4c626ce 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -1,6 +1,9 @@
 Priority list:
 1-9 as in Vim (9 = required for next release, 5 = would be nice, 1 = probably not)
 
+ARCHITECTURE:
+- modular help system
+
 BUGS:
 - add window resize support to hints
 - searching backwards incrementally does not work i.e. with 'incsearch' set
diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index 973b509a..c5cf8efb 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -287,6 +287,7 @@ section:Options[option-index]
 ||'laststatus'|| Show the status line +
 ||'linksearch'|| Limit the search to hyperlink text +
 ||'loadplugins'|| Load plugin scripts when starting up +
+||'maxitems'|| Maximum number of items to display at once in a listing +
 ||'messages'|| Number of messages to store in the message history +
 ||'more'|| Pause the message list window when more than one screen of listings is displayed +
 ||'newtab'|| Define which commands should output in a new tab by default +
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 7b4a5295..f5cd0a5d 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -480,6 +480,7 @@ load plugins earlier, use the [c]:loadplugins[c] command within the
 vimperatorrc.
 ____
 
+
 |\'maxitems'|
 ||'maxitems'|| number (default: 20)
 ____
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index 4f5e37f0..6fa51e1a 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -329,6 +329,7 @@ section:Options[option-index]
 ||'laststatus'|| Show the status line +
 ||'linksearch'|| Limit the search to hyperlink text +
 ||'loadplugins'|| Load plugin scripts when starting up +
+||'maxitems'|| Maximum number of items to display at once in a listing +
 ||'messages'|| Number of messages to store in the message history +
 ||'more'|| Pause the message list window when more than one screen of listings is displayed +
 ||'newtab'|| Define which commands should output in a new tab by default +
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index 9ad5f1de..9bcd2de3 100644
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -477,6 +477,14 @@ xulmusrc.
 ____
 
 
+|\'maxitems'|
+||'maxitems'|| number (default: 20)
+____
+Maximum number of items to display at once in a listing.
+____
+
+
+
 |\'msgs'| |\'messages'|
 ||'messages' 'msgs'|| number (default: 100)
 ____