diff --git a/Cask b/Cask
index e8effd834..2d0b94e38 100644
--- a/Cask
+++ b/Cask
@@ -147,6 +147,7 @@
 (depends-on "go-mode")
 (depends-on "swift-mode")
 (depends-on "vimrc-mode")
+(depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode/")
 
 ;; (depends-on "haxe-mode")
 ;; (depends-on "rust-mode")
diff --git a/init.el b/init.el
index 52d4d8971..0095334f9 100644
--- a/init.el
+++ b/init.el
@@ -76,6 +76,7 @@
         core-workgroups      ; cure Emacs alzheimers
 
         module-cc            ; c/c++/obj-c madness
+        module-crystal       ; ruby at the speed of c
         module-csharp        ; unity, mono and xamarin
         module-data          ; dbs 'n data formats
         module-eshell        ; eshell (on windows)
diff --git a/modules/module-crystal.el b/modules/module-crystal.el
new file mode 100644
index 000000000..fa72886d6
--- /dev/null
+++ b/modules/module-crystal.el
@@ -0,0 +1,10 @@
+;;; module-crystal.el
+
+(use-package crystal-mode
+  :mode "\\.cr$"
+  :interpreter "crystal"
+  :config
+  (setq crystal-indent-level 2))
+
+(provide 'module-crystal)
+;;; module-crystal.el ends here