diff --git a/init.el b/init.el
index 7980cda..ecc8aef 100644
--- a/init.el
+++ b/init.el
@@ -219,7 +219,36 @@
                          :slant       'italic
                          )
      ))
-(add-to-list 'auto-mode-alist '("\\.html.ep\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.html.ep\\'" . web-mode)) ; Mojolicious templates
+
+;; OCaml
+(use-package tuareg
+  :ensure t
+  :mode (("\\.ocamlinit\\'" . tuareg-mode)))
+
+(use-package dune
+  :ensure t)
+
+(use-package merlin
+  :ensure t
+  :config
+  (add-hook 'tuareg-mode-hook #'merlin-mode)
+  (add-hook 'merlin-mode-hook #'company-mode)
+  (setq merlin-error-after-save nil))
+
+(use-package merlin-eldoc
+  :ensure t
+  :hook ((tuareg-mode) . merlin-eldoc-setup))
+
+(use-package flycheck-ocaml
+  :ensure t
+  :config
+  (flycheck-ocaml-setup))
+
+(use-package utop
+  :ensure t
+  :config
+  (add-hook 'tuareg-mode-hook #'utop-minor-mode))
 
 (custom-set-variables
  ;; custom-set-variables was added by Custom.