diff --git a/.vimrc b/.vimrc
index 6b18b1f..67038b9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -188,6 +188,7 @@
     autocmd FileType c,cpp,java,go,php,javascript,python,twig,xml,yml autocmd BufWritePre <buffer> call StripTrailingWhitespace()
     autocmd FileType go autocmd BufWritePre <buffer> Fmt
     autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig
+    autocmd FileType haskell setlocal expandtab shiftwidth=2 softtabstop=2
 
 " }
 
@@ -523,6 +524,7 @@
             autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
             autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
             autocmd FileType ruby setlocal omnifunc=rubycomplete#Complete
+            autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
 
             " Enable heavy omni completion.
             if !exists('g:neocomplcache_omni_patterns')
diff --git a/.vimrc.bundles b/.vimrc.bundles
index dde3107..57965b0 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -173,8 +173,6 @@
             Bundle 'Shougo/vimproc'
             Bundle 'adinapoli/cumino'
             Bundle 'bitc/vim-hdevtools'
-            autocmd FileType haskell setlocal expandtab shiftwidth=2 softtabstop=2
-            autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
         endif
 
     " HTML