diff --git a/ftdetect/bind-named.vim b/ftdetect/bind-named.vim
index 0038d9b..c336a0a 100644
--- a/ftdetect/bind-named.vim
+++ b/ftdetect/bind-named.vim
@@ -11,4 +11,4 @@
 " Remarks:
 " See syntax/bind-named.vim for additional info.
 
-au! BufNewFile,BufRead named.conf,rndc.conf,rndc.key,*-named.conf,*_named.conf,*.named.conf,named-*.conf,named_*.conf,named.*.conf,rndc-*.conf,rndc_*.conf,rndc.*.conf,rndc.key,rndc-*.key,rndc_*.key,rndc.key,mz.*,sz.*,view.*,named.conf*  set filetype=bind-named
+au! BufNewFile,BufRead named.conf,rndc.conf,rndc.key,*-named.conf,*_named.conf,*.named.conf,named-*.conf,named_*.conf,named.*.conf,rndc-*.conf,rndc_*.conf,rndc.*.conf,rndc.key,rndc-*.key,rndc_*.key,rndc.key,mz.*,sz.*,view.*,named.conf*,*.zone, *.zones  set filetype=bind-named
diff --git a/ftplugin/bind-named.vim b/ftplugin/bind-named.vim
index ed61b93..30afab6 100644
--- a/ftplugin/bind-named.vim
+++ b/ftplugin/bind-named.vim
@@ -41,15 +41,15 @@ if namedindent_override_with_local_expandtab != 0
     if namedindent_disable_expandtab != 0
       " expandtab got defined elsewhere, so we use hard tab, locally
       setlocal noexpandtab
-      echomsg "No nein Expandtabby..."
+      " echomsg "No nein Expandtabby..."
     else
       " noexpandtab got defined elsewhere, so we use hard tab, locally
-      echomsg "Expandtabby..."
+      " echomsg "Expandtabby..."
       setlocal expandtab
     endif
+else
+    setlocal expandtab
+    filetype plugin indent on
 endif
 
-setlocal expandtab
-filetype plugin indent on
-
 setlocal completefunc=syntaxcomplete#Complete