diff --git a/ftplugin/make.vim b/ftplugin/make.vim
new file mode 100644
index 0000000..13e2e45
--- /dev/null
+++ b/ftplugin/make.vim
@@ -0,0 +1,10 @@
+" File: make.vim
+" Author: Nirenjan Krishnan
+" Description: Makefile editing settings
+" Last Modified: May 15, 2013
+
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+setlocal noexpandtab
+
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
new file mode 100644
index 0000000..cc40029
--- /dev/null
+++ b/ftplugin/ruby.vim
@@ -0,0 +1,10 @@
+" File: ruby.vim
+" Author: Nirenjan Krishnan
+" Description: Ruby editing settings
+" Last Modified: May 15, 2013
+
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
+setlocal expandtab
+
diff --git a/plugin/tab-expand.vim b/plugin/tab-expand.vim
deleted file mode 100644
index 8190eba..0000000
--- a/plugin/tab-expand.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Tabs plugin for vim
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"
-" This plugin reconfigures the tab key expansion depending on the language
-" of the file being edited.
-"
-" USAGE:
-" -- vim 6:     Stick this file in your ~/.vim/plugin directory (or in a
-"               'plugin' directory in some other directory that is in your
-"               'runtimepath'.
-"
-" -- vim 5:     Stick this file somewhere and 'source cscope.vim' it from
-"               your ~/.vimrc file (or cut and paste it into your .vimrc).
-"
-" NOTE:
-" Make sure to add individual preferences for the language of your choice.
-"
-" Nirenjan Krishnan     nirenjan@gmail.com              2013/04/12
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" Default
-" Tabstop = 4
-" Soft Tabstop = 4
-" Shiftwidth = 4
-" Expand tabs
-autocmd FileType * set ts=4 sts=4 sw=4 et
-
-" Ruby
-" Tabstop = 2, expand
-autocmd FileType ruby setlocal ts=2 sts=2 sw=2 et
-
-" Make
-" Tabstop = 4, No expand tab
-autocmd FileType make setlocal ts=4 sts=4 sw=4 noet
-
diff --git a/vimrc b/vimrc
index 46cb54f..84ba6a4 100644
--- a/vimrc
+++ b/vimrc
@@ -6,7 +6,11 @@ call pathogen#infect()
 call pathogen#helptags()
 
 " Editing options
-" These are now handled by the tab-expand plugin
+" May be overridden by ftplugin
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+set expandtab
 
 " Disable Ex mode
 nnoremap Q <nop>