diff --git a/src/misc2.c b/src/misc2.c
index e6a4e74..407d6b5 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -6342,7 +6342,7 @@
     /* Process the queued netbeans messages. */
     netbeans_parse_messages();
 # endif
-# ifdef FEAT_CLIENTSERVER
+# if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
     /* Process the queued clientserver messages. */
     server_parse_messages();
 # endif
diff --git a/src/version.c b/src/version.c
index e503826..7d61973 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    867,
+/**/
     866,
 /**/
     865,