diff --git a/.config/vim/pack/plugins/opt/arm-syntax-vim b/.config/vim/pack/plugins/opt/arm-syntax-vim
new file mode 160000
index 0000000..caf5355
--- /dev/null
+++ b/.config/vim/pack/plugins/opt/arm-syntax-vim
@@ -0,0 +1 @@
+Subproject commit caf53551a063a6b7d56ce8bc873bb75c066c6b32
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 477e5df..b822b0c 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -29,6 +29,8 @@ let g:surround_no_mappings = 1
 packadd! vim-surround
 source $XDG_CONFIG_HOME/vim/vim-surround.vim
 
+packadd! arm-syntax-vim
+
 " Settings #####################################################################
 " hybrid linenumbers
 set number relativenumber
@@ -259,5 +261,8 @@ else
 	endif
 endif
 
+" ARM assembly syntax highlighting
+au BufNewFile,BufRead *.s,*.S set filetype=arm
+
 " Load filetype plugins
 filetype plugin indent on
diff --git a/.gitmodules b/.gitmodules
index 96a7404..feabe28 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,6 @@
 [submodule ".config/vim/pack/plugins/opt/vimtex"]
 	path = .config/vim/pack/plugins/opt/vimtex
 	url = https://github.com/lervag/vimtex
+[submodule ".config/vim/pack/plugins/opt/arm-syntax-vim"]
+	path = .config/vim/pack/plugins/opt/arm-syntax-vim
+	url = https://github.com/ARM9/arm-syntax-vim