diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bcd36b5..97b3d64 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -439,6 +439,9 @@
 " needs to be inspected.
 au BufNewFile,BufRead *.cql			setf cqlang
 
+" Crystal
+au BufNewFile,BufRead *.cr			setf crystal
+
 " CSV Files
 au BufNewFile,BufRead *.csv			setf csv
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 70e79ea..16726bb 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -131,6 +131,7 @@
     \ 'cqlang': ['file.cql'],
     \ 'crm': ['file.crm'],
     \ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],
+    \ 'crystal': ['file.cr'],
     \ 'cs': ['file.cs', 'file.csx'],
     \ 'csc': ['file.csc'],
     \ 'csdl': ['file.csdl'],
diff --git a/src/version.c b/src/version.c
index 277e522..585f72c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1415,
+/**/
     1414,
 /**/
     1413,