diff --git a/.vimrc b/.vimrc
index 87d851e..325508b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -66,6 +66,9 @@ Plug 'vim-airline/vim-airline'
 " Git diff in sign column
 Plug 'airblade/vim-gitgutter'
 
+" Python-mode
+Plug 'python-mode/python-mode', { 'for': 'python', 'branch': 'develop' }
+
 call plug#end()
 
 
@@ -75,9 +78,11 @@ call plug#end()
 " special configuration:
 
 " Python
-autocmd FileType python setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
+" ======
+"
+" python-mode configuration (see :help pymode)
+let g:pymode_options_max_line_length = 120
 "let g:pydiction_location = '~/.vim/pydiction-1.2/complete-dict'
-let g:pymode_folding = 0
 
 
 " Vala