diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 3194e1d..2652cae 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -28,6 +28,7 @@ let s:default_settings = {
     \ 'show_call_signatures': 1,
     \ 'call_signature_escape': "'=`='",
     \ 'auto_close_doc': 1,
+    \ 'max_doc_height': 30,
     \ 'popup_select_first': 1,
     \ 'quickfix_window_height': 10,
     \ 'completions_enabled': 1,
@@ -252,8 +253,8 @@ function! jedi#show_documentation()
     setlocal nomodified
     setlocal filetype=rst
 
-    if l:doc_lines > 30  " max lines for plugin
-        let l:doc_lines = 30
+    if l:doc_lines > g:jedi#max_doc_height " max lines for plugin
+        let l:doc_lines = g:jedi#max_doc_height
     endif
     execute "resize ".l:doc_lines
 
diff --git a/doc/jedi-vim.txt b/doc/jedi-vim.txt
index 82e24f1..e450a29 100644
--- a/doc/jedi-vim.txt
+++ b/doc/jedi-vim.txt
@@ -280,7 +280,8 @@ Function: `jedi#show_documentation()`
 Default: <K>				Show pydoc documentation
 
 This shows the pydoc documentation for the item currently under the cursor.
-The documentation is opened in a horizontally split buffer.
+The documentation is opened in a horizontally split buffer. The height of this
+buffer is controlled by `g:jedi#max_doc_height` (set by default to 30).
 
 ------------------------------------------------------------------------------
 5.5. `g:jedi#rename_command`		*g:jedi#rename_command*