diff --git a/vimrc b/vimrc
index cbefd02..691d431 100644
--- a/vimrc
+++ b/vimrc
@@ -53,6 +53,12 @@ set expandtab
 " Indent using four spaces.
 set tabstop=4 
 
+"
+" PEP8 rules
+"
+let g:autopep8_max_line_length=150
+let g:autopep8_on_save = 1
+
 "
 " Search Options
 "