diff --git a/.gitmodules b/.gitmodules
index bd3d716..3604ae4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,9 @@
 [submodule "compat"]
 	path = lib/compat
 	url = https://github.com/emacs-compat/compat.git
+[submodule "cond-let"]
+	path = lib/cond-let
+	url = https://github.com/tarsius/cond-let
 [submodule "dash"]
 	path = lib/dash
 	url = https://github.com/magnars/dash.el.git
diff --git a/init.el b/init.el
index 88c19b6..c9995ae 100644
--- a/init.el
+++ b/init.el
@@ -75,6 +75,10 @@
 
 ;;; Long tail
 
+(use-package cond-let
+  :config
+  (font-lock-add-keywords 'emacs-lisp-mode cond-let-font-lock-keywords t))
+
 (use-package diff-hl
   :config
   (setq diff-hl-draw-borders nil)
diff --git a/lib/cond-let b/lib/cond-let
new file mode 160000
index 0000000..09ebf1c
--- /dev/null
+++ b/lib/cond-let
@@ -0,0 +1 @@
+Subproject commit 09ebf1caa81c99677ce74091a23b48a28d53bcd9