diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 98c112c..8f13f61 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -5,6 +5,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages bash)
   #:use-module (oni packages emacs)
   #:use-module (oni packages go))
@@ -355,3 +356,19 @@ Emacs")))
       ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
    (synopsis "My Emacs Clojure configuration")
    (description "This package provides my configuration for Clojure")))
+
+(define-public emacs-oni-cmake
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-cmake")
+   (arguments
+    '(#:include '("oni-cmake.el")))
+   (propagated-inputs
+    `(("emacs-cmake-mode" ,emacs-cmake-mode)
+      ("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-lsp" ,emacs-oni-lsp)
+      ("emacs-cmake-font-lock" ,emacs-cmake-font-lock)
+      ("emacs-eldoc-cmake" ,emacs-eldoc-cmake)))
+   (synopsis "My Emacs CMake confifguration")
+   (description "This package provides my configuration for CMake")))
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 35d265e..7f3c3be 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -204,3 +204,30 @@ To setup nroam for all org-roam buffers, evaluate the following:
 (add-hook 'org-mode-hook #'nroam-setup-maybe)
 ")
    (license license:gpl3+)))
+
+(define-public emacs-eldoc-cmake
+  (package
+   (name "emacs-eldoc-cmake")
+   (version "20190419.2244")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+           "https://melpa.org/packages/eldoc-cmake-"
+           version
+           ".el"))
+     (sha256
+      (base32
+       "08qa4lp22pracwskjq1kqv6kjwfbgyjsjsxb8kv820ndz5ccwaik"))))
+   (build-system emacs-build-system)
+   (home-page
+    "https://github.com/ikirill/eldoc-cmake")
+   (synopsis "Eldoc support for CMake")
+   (description
+    "
+CMake eldoc support, using a pre-generated set of docstrings from
+CMake's documentation source.
+
+See function `eldoc-cmake-enable'.
+")
+   (license license:gpl3)))