diff --git a/home-config/dotfiles/emacs.d/config/programming-languages.el b/home-config/dotfiles/emacs.d/config/programming-languages.el
index 6dacc9bd..493b957a 100644
--- a/home-config/dotfiles/emacs.d/config/programming-languages.el
+++ b/home-config/dotfiles/emacs.d/config/programming-languages.el
@@ -107,6 +107,14 @@
   :mode (rx (or ".yaml" ".yml" ".bst"
                 (and string-start "project.conf")) string-end))
 
+;; ----------------------------------------------------------------------------------
+;;; Kotlin
+;; ----------------------------------------------------------------------------------
+
+(use-package kotlin-mode
+  :hook (kotlin-mode . (lambda () (setq-local devdocs-current-docs '("kotlin~1.9"))))
+  :mode (rx ".kt" (optional "s") string-end))
+
 ;; ----------------------------------------------------------------------------------
 ;;; Markdown
 ;; ----------------------------------------------------------------------------------
@@ -302,7 +310,7 @@
 
 (use-package eglot
   :commands (eglot eglot-format eglot-managed-p eglot--major-mode)
-  :hook (((web-mode rust-mode python-mode sh-mode c-mode c++-mode nix-mode) .
+  :hook (((kotlin-mode web-mode rust-mode python-mode sh-mode c-mode c++-mode nix-mode) .
           eglot-ensure)
          (eglot-managed-mode . set-eldoc-compose))
   :bind