diff --git a/.gitmodules b/.gitmodules
index e8d9d4f..12d9c95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "bundle/fontsize"]
 	path = bundle/fontsize
 	url = git://github.com/vim-scripts/fontsize.vim.git
+[submodule "bundle/nginx"]
+	path = bundle/nginx
+	url = git://github.com/vim-scripts/nginx.vim.git
diff --git a/bundle/nginx b/bundle/nginx
new file mode 160000
index 0000000..d325c9a
--- /dev/null
+++ b/bundle/nginx
@@ -0,0 +1 @@
+Subproject commit d325c9ad77a1dc03f5ec3fcf60408f2d07571247
diff --git a/vimrc b/vimrc
index e1077b9..f94a30f 100644
--- a/vimrc
+++ b/vimrc
@@ -46,3 +46,6 @@ map <silent> <M-d> :execute 'NERDTreeToggle'<CR>
 " Session plugin settings
 let g:session_autosave = 1
 let g:session_autoload = 1
+
+" Set filetype for nginx confs
+au BufRead,BufNewFile /usr/local/conf/* set ft=nginx