diff --git a/.config/vim/ftdetect/arm.vim b/.config/vim/ftdetect/arm.vim
new file mode 100644
index 0000000..37729a2
--- /dev/null
+++ b/.config/vim/ftdetect/arm.vim
@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.s,*.S set filetype=arm
diff --git a/.config/vim/pack/plugins/start/arm-syntax-vim b/.config/vim/pack/plugins/start/arm-syntax-vim
new file mode 120000
index 0000000..16a6f6e
--- /dev/null
+++ b/.config/vim/pack/plugins/start/arm-syntax-vim
@@ -0,0 +1 @@
+../opt/arm-syntax-vim/
\ No newline at end of file
diff --git a/.config/vim/vimrc.d/20-plugins.vim b/.config/vim/vimrc.d/20-plugins.vim
index a035147..f31f420 100644
--- a/.config/vim/vimrc.d/20-plugins.vim
+++ b/.config/vim/vimrc.d/20-plugins.vim
@@ -2,8 +2,6 @@
 " Load all plugins in pack/*/start
 packloadall
 
-" ARM assembly syntax highlighting
-autocmd BufNewFile,BufRead *.s,*.S packadd! arm-syntax-vim | set filetype=arm
 " Auto completion
 " needs vim >= 8.1.1719 to support features like popup and text property.
 if (has('patch-8.1.1719') || has('nvim'))