diff --git a/NEWS b/NEWS
index 9879bc55..96a25196 100644
--- a/NEWS
+++ b/NEWS
@@ -9,12 +9,14 @@
 	  removed the following hint options: 'hintchars' 'maxhints'
 	  added the following hint options: 'hinttimeout'
 	* IMPORTANT: changed 'I' key to Ctrl-Q to also work in textboxes
+	* new 'history' option for specifying the number of Ex commands and
+	  search patterns to store in the commandline history
 	* new ctrl-x and ctrl-a mappings to increment the last number in the URL
 	* new ~ mapping to open the home directory
 	* :open tries to open a relative filename now, if you do a :open foo.html
 	  or :open ../hello.txt;
 	* new :cd and :pwd commands
-    * new :dialog command to open various firefox dialogs
+	* new :dialog command to open various firefox dialogs
 	* new a and A mappings to deal with bookmarks
 	* added ]] and [[ to navigate to the next/previous document based on
 	  the regexp specified in 'nextpattern' and 'previouspattern' (thanks kidd)
diff --git a/vimperator.vim b/vimperator.vim
index 665ef0ce..309da4a8 100644
--- a/vimperator.vim
+++ b/vimperator.vim
@@ -38,11 +38,11 @@ syn match vimperatorCommandWrapper "\%(^\s*:\=\)\@<=\%(!\|\h\w*\>\)" contains=vi
 
 syn region vimperatorSet matchgroup=vimperatorCommand start="\%(^\s*:\=\)\@<=\<set\=\>" end="$" keepend oneline contains=vimperatorOption
 syn keyword vimperatorOption activate act complete cpt defsearch ds editor extendedhinttags eht focusedhintstyle fhs fullscreen fs
-	\ nofullscreen nofs guioptions go hintstyle hs hinttags ht hinttimeout hto hlsearch hls nohlsearch nohls hlsearchstyle
-	\ hlss nohlsearchstyle nohlss incsearch is noincsearch nois ignorecase ic noignorecase noic insertmode im noinsertmode
-	\ noim laststatus ls linksearch lks nolinksearch nolks more nextpattern nomore pageinfo pa popups pps preload nopreload
-	\ previewheight pvh previouspattern scroll scr showmode smd noshowmode nosmd showstatuslinks ssli showtabline stal
-	\ smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb novisualbell novb
+	\ nofullscreen nofs guioptions go hintstyle hs hinttags ht hinttimeout hto history hi hlsearch hls nohlsearch nohls
+	\ hlsearchstyle hlss nohlsearchstyle nohlss incsearch is noincsearch nois ignorecase ic noignorecase noic insertmode im
+	\ noinsertmode noim laststatus ls linksearch lks nolinksearch nolks more nextpattern nomore pageinfo pa popups pps preload
+	\ nopreload previewheight pvh previouspattern scroll scr showmode smd noshowmode nosmd showstatuslinks ssli showtabline
+	\ stal smartcase scs nosmartcase noscs titlestring usermode um nousermode noum verbose vbs visualbell vb novisualbell novb
 	\ wildmode wim wildoptions wop
 	\ contained