diff --git a/config.org b/config.org
index 27cc543..b7dbd21 100644
--- a/config.org
+++ b/config.org
@@ -5,6 +5,8 @@
 
 * Elpaca
 
+** Core
+
 #+begin_src emacs-lisp
 (defvar elpaca-installer-version 0.7)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
@@ -46,14 +48,68 @@
 (elpaca `(,@elpaca-order))
 #+end_src
 
+** Use-package integration
+
 #+begin_src emacs-lisp
-  ;; Install use-package support
-  (elpaca elpaca-use-package
-    ;; Enable use-package :ensure support for Elpaca.
-    (elpaca-use-package-mode)
-    )
+;; Install use-package support
+(elpaca elpaca-use-package
+  ;; Enable use-package :ensure support for Elpaca.
+  (elpaca-use-package-mode)
+  )
+
+;; wait to get elpaca use-package integration
+(elpaca-wait)
 #+end_src
 
+* Built-in packages
+** Eldoc
+
+I got the following error message when loading eglot:
+#+BEGIN_SRC
+eglot                          failed               eldoc installed version (1 13 0) lower than min required 1.14.0                  00.239351
+#+END_SRC
+
+So install the eldoc package to be sure we have the latest version.
+But after installing it, we get a new warning:
+
+#+BEGIN_SRC
+⛔ Warning (emacs): eldoc loaded before Elpaca activation
+#+END_SRC
+
+This seemed tricker than expected, but found a solution in the github issues of elpaca:
+https://github.com/progfolio/elpaca/issues/236
+
+#+BEGIN_SRC emacs-lisp
+(use-package eldoc
+  :preface
+  ;; avoid loading of built-in eldoc, see https://github.com/progfolio/elpaca/issues/236#issuecomment-1879838229
+  (unload-feature 'eldoc t)
+  (setq custom-delayed-init-variables '())
+  (defvar global-eldoc-mode nil)
+  :demand t
+  :config
+  (global-eldoc-mode))
+
+#+END_SRC
+
+** Jsonrpc
+After eldoc was taken care of, a new error was reported:
+#+BEGIN_SRC
+eglot                          failed               jsonrpc installed version (1 0 16) lower than min required 1.0.24                00.280828
+#+END_SRC
+
+So let's install the latest one:
+#+BEGIN_SRC emacs-lisp
+(use-package jsonrpc)
+#+END_SRC
+
+** Wait for loading updated packages
+
+Wait until updated built-in packages are fully loaded:
+#+BEGIN_SRC emacs-lisp
+(elpaca-wait)
+#+END_SRC
+
 * General config
 
 ** Bell