diff --git a/configuration.org b/configuration.org
index e5a7bad..5fa07dc 100644
--- a/configuration.org
+++ b/configuration.org
@@ -3026,3 +3026,13 @@ directory.  It is available from [[http://plantuml.com/download][here]].
 (define-key 'help-command (kbd "C-k") 'find-function-on-key)
 (define-key 'help-command (kbd "C-v") 'find-variable)
 #+END_SRC
+* And finally, server mode
+
+Sometimes i start an ~emacsclient~ process, like for editing a commit message or something
+similar.  As my startup time is pretty long, waiting for everything to complete is undesirable.
+
+#+BEGIN_SRC emacs-lisp
+(require 'server)
+(unless (server-running-p)
+  (server-start))
+#+END_SRC