diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index 5f3ae4a..6163003 100644
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -209,6 +209,10 @@
   elseif name =~ 'nix-shell'
     return 'nix'
 
+    # Crystal
+  elseif name =~ '^crystal\>'
+    return 'crystal'
+
   endif
 
   return ''
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0bd6453..aff66d8 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -944,6 +944,7 @@
     fish:   [['#!/path/fish']],
     forth:  [['#!/path/gforth']],
     icon:   [['#!/path/icon']],
+    crystal: [['#!/path/crystal']],
   }
 enddef
 
diff --git a/src/version.c b/src/version.c
index 0d647ec..5b5fdb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1807,
+/**/
     1806,
 /**/
     1805,