diff --git a/vim/vimrc b/vim/vimrc
index 85168ea..604a467 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -128,6 +128,12 @@ fu _agw.close_empty()
 	endif
 endfu
 
+fu _agw.setup_asm()
+	setlocal shiftwidth=8
+	setlocal tabstop=8
+	setlocal filetype=asm_ca65
+endfu
+
 " Settings -------------------------------------------------------------------|
 
 " general settings (use :help for these)
@@ -390,7 +396,7 @@ endif
 au FileType markdown set comments+=fb:- comments-=b:- indentexpr=
 
 " ASM options
-au BufNewFile,BufRead *.s,*.inc setlocal shiftwidth=8 filetype=asm_ca65
+au BufNewFile,BufRead *.s,*.inc call _agw.setup_asm()
 
 " close empty buffers automatically
 au BufEnter * call _agw.close_empty()