diff --git a/vim/.vim/after/ftplugin/make.vim b/vim/.vim/after/ftplugin/make.vim
new file mode 100644
index 0000000..1bcd00b
--- /dev/null
+++ b/vim/.vim/after/ftplugin/make.vim
@@ -0,0 +1,3 @@
+" Makefiles should use tabs to indent
+setlocal noexpandtab
+let b:undo_ftplugin.='|setlocal noexpandtab<'
diff --git a/vim/.vimrc b/vim/.vimrc
index 12c324f..f88ac1d 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -36,8 +36,6 @@ set softtabstop=-1
 set shiftround
 " You shouldn't change the default tab width of 8 characters
 set tabstop=8
-" Makefiles should use tabs to indent
-autocmd Filetype make setlocal noexpandtab
 " }}}
 
 " Plugins {{{