diff --git a/ftdetect/octave.vim b/ftdetect/octave.vim
index eaf40f0..e3073d9 100644
--- a/ftdetect/octave.vim
+++ b/ftdetect/octave.vim
@@ -1 +1,9 @@
-au! BufRead,BufNewFile *.m,*.oct setlocal filetype=octave
+augroup octave
+  autocmd!
+  autocmd BufRead,BufNewFile *.m,*.oct setfiletype octave
+  " https://docs.octave.org/latest/The-DESCRIPTION-File.html
+  autocmd BufNewFile,BufRead DESCRIPTION setfiletype yaml
+  " TODO: https://github.com/gnu-octave/vim-octave/issues/5
+  " https://docs.octave.org/latest/The-INDEX-File.html
+  " autocmd BufNewFile,BufRead INDEX setfiletype octave-index
+augroup END