diff --git a/doc/chapters/tlsauthentication.inc b/doc/chapters/tlsauthentication.inc
index 278a3ba5..f945544e 100644
--- a/doc/chapters/tlsauthentication.inc
+++ b/doc/chapters/tlsauthentication.inc
@@ -157,8 +157,11 @@ obtain the raw GnuTLS session handle from @emph{MHD} using
 #include <gnutls/x509.h>
 
 gnutls_session_t tls_session;
-tls_session = MHD_get_connection_info (connection, 
-                                       MHD_CONNECTION_INFO_GNUTLS_SESSION);
+union MHD_ConnectionInfo *ci;
+
+ci = MHD_get_connection_info (connection, 
+                              MHD_CONNECTION_INFO_GNUTLS_SESSION);
+tls_session = ci->tls_session;
 @end verbatim
 
 You can then extract the client certificate:
diff --git a/doc/examples/tlsauthentication.c b/doc/examples/tlsauthentication.c
index 7d6e66f5..01006d50 100644
--- a/doc/examples/tlsauthentication.c
+++ b/doc/examples/tlsauthentication.c
@@ -13,7 +13,7 @@
 #define SERVERCERTFILE "server.pem"
 
 
-char *
+static char *
 string_to_base64 (const char *message)
 {
   const char *lookup =