diff --git a/vim/gvimrc.local b/vim/gvimrc.local
index 8d88af1..3fa93de 100644
--- a/vim/gvimrc.local
+++ b/vim/gvimrc.local
@@ -5,3 +5,7 @@ set transparency=4
 if has("gui_macvim")
   macmenu Window.Toggle\ Full\ Screen\ Mode key=<D-CR>
 endif
+
+" Mac OS X style command line editing
+cnoremap <A-Backspace> <C-W>
+cnoremap <D-Backspace> <C-U>
diff --git a/vim/vimrc.local b/vim/vimrc.local
index 1863643..0a08e12 100644
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -45,3 +45,10 @@ imap nn <Leader>  |
 
 map <Esc> <nop>   |
 imap <Esc> <nop>  |
+
+" Emacs-like keys for the command line
+cnoremap <C-A>      <Home>
+cnoremap <C-E>      <End>
+cnoremap <C-K>      <C-U>
+
+