diff --git a/.vimrc b/.vimrc
index 9b972ff..22405c2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -310,8 +310,10 @@ if has('gui_running')
     "set guifont=Consolas\ 12  "I like this font, but it looks like crap on linux
     set guifont=Fixed\ 14      "I like this font better.
     set mouse=a                "Enable mouse support
-    set guioptions-=T          "No toolbar
-    set guioptions-=m          "Nor menu
+    "No toolbar, menu, scrollbars, draw simple text tabs. This would keep 
+    "window in one place, and also this will conserve space. Tabs are huge 
+    "under GTK.
+    set guioptions=agit
     "add menuitem OpenInFirefox
     nmenu 666 PopUp.&Open\ in\ browser :call OpenInFirefox()<cr>
     "Turn off annoying beep
diff --git a/GetLatest/GetLatestVimScripts.dat b/GetLatest/GetLatestVimScripts.dat
index fb3af36..f9f4cd7 100644
--- a/GetLatest/GetLatestVimScripts.dat
+++ b/GetLatest/GetLatestVimScripts.dat
@@ -5,7 +5,7 @@ ScriptID SourceID Filename
 #2754 13139 :AutoInstall: delimitMate.vim
 1984 13961 fuzzyfinder.vim
 311 7645 grep.vim
-3304 15184 gundo.vim
+3304 15211 gundo.vim
 2727 11120 jsbeautify.vim
 2666 14741 Mark
 2262 8944 occur.vim
diff --git a/doc/gundo.txt b/doc/gundo.txt
index d9d3995..3ee2b48 100644
--- a/doc/gundo.txt
+++ b/doc/gundo.txt
@@ -211,6 +211,8 @@ GitHub: http://github.com/sjl/gundo.vim/
 ==============================================================================
 7. Changelog                                                  *GundoChangelog*
 
+v2.1.1
+    * Fix a bug with the movement key mappings.
 v2.1.0
     * Warnings about having an incompatible Vim and/or Python installation
       are now deferred until the first time you try to use Gundo, instead
diff --git a/plugin/gundo.vim b/plugin/gundo.vim
index dc61e20..49cd83f 100644
--- a/plugin/gundo.vim
+++ b/plugin/gundo.vim
@@ -432,8 +432,8 @@ endfunction"}}}
 "{{{ Gundo buffer settings
 
 function! s:GundoMapGraph()"{{{
-    exec 'nnoremap <script> <silent>' . g:gundo_map_move_older . " :call <sid>GundoMove(1)<CR>"
-    exec 'nnoremap <script> <silent>' . g:gundo_map_move_newer . " :call <sid>GundoMove(-1)<CR>"
+    exec 'nnoremap <script> <silent> <buffer> ' . g:gundo_map_move_older . " :call <sid>GundoMove(1)<CR>"
+    exec 'nnoremap <script> <silent> <buffer> ' . g:gundo_map_move_newer . " :call <sid>GundoMove(-1)<CR>"
     nnoremap <script> <silent> <buffer> <CR>          :call <sid>GundoRevert()<CR>
     nnoremap <script> <silent> <buffer> o             :call <sid>GundoRevert()<CR>
     nnoremap <script> <silent> <buffer> <down>        :call <sid>GundoMove(1)<CR>