diff --git a/vim/vimrc.d/filetypes.vim b/vim/vimrc.d/filetypes.vim
new file mode 100644
index 0000000..4a86a5b
--- /dev/null
+++ b/vim/vimrc.d/filetypes.vim
@@ -0,0 +1,9 @@
+" ES6
+autocmd BufRead,BufNewFile *.es6 setfiletype javascript
+
+" Riot.js tags
+autocmd BufRead,BufNewFile *.tag setfiletype html
+
+" Jbuilder tags
+autocmd BufRead,BufNewFile *.jbuilder setfiletype ruby
+