diff --git a/mu/mu-cmd-server.c b/mu/mu-cmd-server.c
index 43b651ce..f37331d6 100644
--- a/mu/mu-cmd-server.c
+++ b/mu/mu-cmd-server.c
@@ -1292,6 +1292,9 @@ cmd_ping (ServerContext *ctx, GSList *args, GError **err)
 #ifdef BUILD_CRYPTO
 		    "  :crypto t "
 #endif /*BUILD_CRYPTO*/
+#ifdef BUILD_GUILE
+		    " :guile t "
+#endif /*BUILD_GUILE*/
 		    "  :version \"" VERSION "\" "
 		    "  :doccount %u))",doccount);
 
diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index 1215e1d1..9864e03d 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -103,11 +103,13 @@ clicked."
 	(propertize  mu4e-mu-version 'face 'mu4e-view-header-key-face)
 
 	;; show some server properties; in this case; a big C when there's
-	;; crypto support
+	;; crypto support, a big G when there's Guile support
 	" "
-	(if (plist-get mu4e~server-props :crypto)
-	  (propertize "C" 'face 'mu4e-title-face)
-	  "")
+	(propertize
+	  (concat
+	    (when (plist-get mu4e~server-props :crypto) "C")
+	    (when (plist-get mu4e~server-props :guile)  "G"))
+	  'face 'mu4e-title-face)
 	"\n\n"
 	(propertize "  Basics\n\n" 'face 'mu4e-title-face)
 	(mu4e~main-action-str "\t* [j]ump to some maildir\n" 'mu4e-jump-to-maildir)
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 32b3d3b1..3ea951f8 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -574,7 +574,7 @@ The main view looks something like the following:
 
 @cartouche
 @verbatim
-    * mu4e - mu for emacs version x.x C
+    * mu4e - mu for emacs version x.x CG
 
       Basics
 
@@ -601,13 +601,17 @@ The main view looks something like the following:
 @end verbatim
 @end cartouche
 
-If you see a @t{C} at the right-hand side of @t{version x.x}, your @t{mu4e}
-has support for decryption of encrypted messages, and verifying
-signatures. See @ref{Decryption} and @ref{Verifying signatures} in the
-@ref{Message view}.
-
-Now, let's go through menu items, assuming the default key bindings.
+In the example above, you can see the letters ``@t{CG}'', which indicate:
+@itemize
+@item @t{C}: support for decryption of encrypted messages, and verifying
+signatures. See @ref{MSGV Crypto} in the @ref{Message view} for details.
+@item @t{G}: support for the Guile 2.0 programming language
+@end itemize
+Whether you see both, one or none of these letters depends on the way @t{mu}
+is built.
 
+Let's walk through the menu.
+ 
 @node Basic actions
 @section Basic actions