diff --git a/custom.el b/custom.el
index 516f806..7660e7a 100644
--- a/custom.el
+++ b/custom.el
@@ -12,7 +12,7 @@
  '(ecb-options-version "2.50")
  '(package-selected-packages
    (quote
-    (nginx-mode all-the-icons neotree emmet-mode ecb undo-tree pip-requirements jedi highlight-indent-guides yaml-mode whitespace-cleanup-mode sublime-themes sml-modeline smarty-mode smart-mode-line-powerline-theme scss-mode sass-mode rainbow-mode prettier-js pkgbuild-mode pcre2el nlinum markdown-mode less-css-mode flycheck editorconfig anzu ac-php))))
+    (crystal-mode nginx-mode all-the-icons neotree emmet-mode ecb undo-tree pip-requirements jedi highlight-indent-guides yaml-mode whitespace-cleanup-mode sublime-themes sml-modeline smarty-mode smart-mode-line-powerline-theme scss-mode sass-mode rainbow-mode prettier-js pkgbuild-mode pcre2el nlinum markdown-mode less-css-mode flycheck editorconfig anzu ac-php))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el b/init.el
index 1b95c63..d37c483 100644
--- a/init.el
+++ b/init.el
@@ -47,6 +47,7 @@
 ;;(require 'init-editorconfig)
 ;; Languages
 (require 'init-ccc)
+(require 'init-crystal)
 (require 'init-markdown)
 (require 'init-python)
 (require 'init-pkgbuild)
diff --git a/lisp/init-crystal.el b/lisp/init-crystal.el
new file mode 100644
index 0000000..3427e0e
--- /dev/null
+++ b/lisp/init-crystal.el
@@ -0,0 +1,10 @@
+;;----------------------------------------------------------------------------
+;; Crystal Mode
+;;----------------------------------------------------------------------------
+(require-package 'crystal-mode)
+
+(autoload 'crystal-mode "crystal-mode" "Major mode for crystal files" t)
+(add-to-list 'auto-mode-alist '("\\.cr$" . crystal-mode))
+(add-to-list 'interpreter-mode-alist '("crystal" . crystal-mode))
+
+(provide 'init-crystal)