diff --git a/README.rst b/README.rst
index fcfe148..df275b8 100644
--- a/README.rst
+++ b/README.rst
@@ -97,6 +97,10 @@ And you can list all names that are related (have the same origin)::
 
     let g:jedi#related_names_command = "<leader>n"
 
+If you want to change the default autocompletion command::
+
+    let g:jedi#autocompletion_command = "<C-Space>"
+
 By default you get a window that displays the function definition you're
 currently in. If you don't want that::
 
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index 7e74ff6..2a6b06d 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -6,9 +6,14 @@ let b:did_ftplugin = 1
 
 if g:jedi#auto_initialization
     setlocal omnifunc=jedi#complete
+
+    echom g:jedi#autocompletion_command
     " map ctrl+space for autocompletion
-    inoremap <buffer> <Nul> <C-X><C-O>
-    inoremap <buffer> <C-Space> <C-X><C-O>
+    if g:jedi#autocompletion_command == "<C-Space>"
+        " in terminals, <C-Space> sometimes equals <Nul>
+        inoremap <buffer><Nul> <C-X><C-O>
+    endif
+    execute "inoremap <buffer>".g:jedi#autocompletion_command." <C-X><C-O>"
 
     " goto / get_definition / related_names
     execute "noremap <buffer>".g:jedi#goto_command." :call jedi#goto()<CR>"
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
index 1406664..ed70117 100644
--- a/plugin/jedi.vim
+++ b/plugin/jedi.vim
@@ -24,6 +24,7 @@ let s:settings = {
     \ 'auto_initialization': 1,
     \ 'auto_vim_configuration': 1,
     \ 'goto_command': "'<leader>g'",
+    \ 'autocompletion_command': "'<C-Space>'",
     \ 'get_definition_command': "'<leader>d'",
     \ 'related_names_command': "'<leader>n'",
     \ 'rename_command': "'<leader>r'",