diff --git a/README.md b/README.md
index 8cc00692..025efc63 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,8 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
 
 #### Navigation
 
- * `,z` - jump back and forth between last two buffers
+ * `,z` - go to previous buffer (:bp)
+ * `,x` - go to next buffer (:bn)
  * `Ctrl-j` and `Ctrl-k` to move up and down roughly by functions
  * `Ctrl-o` - Old cursor position - this is a standard mapping but very useful, so included here
  * `Ctrl-i` - opposite of Ctrl-O (again, this is standard)
diff --git a/vim/plugin/settings/yadr-keymap.vim b/vim/plugin/settings/yadr-keymap.vim
index d648ff41..cea0a5d6 100644
--- a/vim/plugin/settings/yadr-keymap.vim
+++ b/vim/plugin/settings/yadr-keymap.vim
@@ -98,8 +98,10 @@ nnoremap <silent> ,f <C-]>
 nnoremap <silent> ,F :let word=expand("<cword>")<CR>:vsp<CR>:wincmd w<cr>:exec("tag ". word)<cr>
 
 
-"toggle between last two buffers with Z (normally ctrl-shift-6)
-nnoremap <silent> ,z <C-^>
+"Move back and forth through previous and next buffers
+"with ,z and ,x
+nnoremap <silent> ,z :bp<CR>
+nnoremap <silent> ,x :bn<CR>
 
 " ==============================
 " Window/Tab/Split Manipulation