diff --git a/layers/+tools/ycmd/README.org b/layers/+tools/ycmd/README.org
index 95d37d9bf..25e14d315 100644
--- a/layers/+tools/ycmd/README.org
+++ b/layers/+tools/ycmd/README.org
@@ -13,7 +13,8 @@
 
 * Description
 
-This layer adds [[https://github.com/abingham/emacs-ycmd][emacs-ycmd]] support.
+This layer adds [[https://github.com/abingham/emacs-ycmd][emacs-ycmd]] support, including its integrations with company,
+flycheck, and eldoc.
 
 * Install
 ** Layer
diff --git a/layers/+tools/ycmd/packages.el b/layers/+tools/ycmd/packages.el
index 560414c46..72c264978 100644
--- a/layers/+tools/ycmd/packages.el
+++ b/layers/+tools/ycmd/packages.el
@@ -28,4 +28,13 @@
         (setq-default ycmd-global-config
                       (concat (configuration-layer/get-layer-path 'ycmd)
                               "global_conf.py")))
-      (setq-default ycmd-parse-conditions '(save mode-enabled)))))
+      (setq-default ycmd-parse-conditions '(save mode-enabled)))
+    :config
+    (progn
+      (require 'ycmd-eldoc)
+      (add-hook 'ycmd-mode-hook 'ycmd-eldoc-setup))))
+
+(defun ycmd/init-ycmd-eldoc ()
+  (use-package ycmd-eldoc
+    :defer t
+    :init (add-hook 'ycmd-mode-hook 'ycmd-eldoc-setup)))