diff --git a/vimrc b/vimrc
index a6688c7..b84552d 100644
--- a/vimrc
+++ b/vimrc
@@ -348,6 +348,12 @@ if has('autocmd')
         autocmd FileType html,css call <SID>strip_trailing_whitespace()
     augroup END
 
+    " Indent wrapped long lines of code to leading indent
+    augroup WrapLongLinesWithProperIndentation
+        autocmd!
+        autocmd FileType python,c,cpp,objc,objcpp,html,css setlocal breakindent showbreak=\ \ \ \ 
+    augroup END
+
     augroup SConsFileType
         autocmd!
         autocmd BufRead SCons{truct,cript} setf python