diff --git a/vim/ftplugin/bindzone.vim b/vim/ftplugin/bindzone.vim
new file mode 100644
index 0000000000000000000000000000000000000000..e1bce481549d12465209d63c68f6a24990b3e13b
--- /dev/null
+++ b/vim/ftplugin/bindzone.vim
@@ -0,0 +1 @@
+let b:ml_commentstring = '; %s'
diff --git a/vim/ftplugin/dns.vim b/vim/ftplugin/dns.vim
new file mode 100644
index 0000000000000000000000000000000000000000..82bfff3ea1c510e7c8c781dc78c2903a92f7f477
--- /dev/null
+++ b/vim/ftplugin/dns.vim
@@ -0,0 +1,2 @@
+" This has been replaced by the bindzone filetype
+:runtime! ftplugin/bindzone.vim
diff --git a/vim/ftplugin/named.vim b/vim/ftplugin/named.vim
new file mode 100644
index 0000000000000000000000000000000000000000..95db5c06beb69eff1e95803094dd300fd9060b37
--- /dev/null
+++ b/vim/ftplugin/named.vim
@@ -0,0 +1,2 @@
+" Set the modeline to use a single line comment
+let b:ml_commentstring = '// %s'
diff --git a/vimrc b/vimrc
index 50217c6773e5b6e7470aae50d10083cb9825174f..825b4f4b402d41a242f4872b21756ecc08476aab 100644
--- a/vimrc
+++ b/vimrc
@@ -93,10 +93,6 @@ function! AppendModeline()
 endfunction
 
 
-" Filetype specific settings
-autocmd FileType dns setlocal commentstring=;\ %s
-
-
 " Map numpad keys in insert and command-line mode
 "noremap! <Esc>Oq 1
 "noremap! <Esc>Or 2