diff --git a/.vimrc b/.vimrc
index 5efcf63..e01fdf2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -84,6 +84,8 @@ let g:ConqueTerm_CWInsert = 1
 let g:ConqueTerm_InsertOnEnter = 0
 let g:ConqueTerm_SendVisKey = '<Leader>ss'
 
+au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+au BufEnter *.org            call org#SetOrgFileType()
 "MiniBufExplore Options
 "let g:miniBufExplMapWindowNavVim = 1
 "let g:miniBufExplMapWindowNavArrows = 1