diff --git a/ChangeLog b/ChangeLog
index 30a460233..304c265d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-28  Jody Goldberg <jody@gnome.org>
+
+	* gnome-settings-daemon/gnome-settings-keyboard-xkb.c
+	(activation_error) : don't bother VNC users with warnings of XKB
+	  breakage, we already know it is not going to work.
+
 2005-02-09  Sebastien Bacher  <seb128@debian.org>
 
 	* configure.in: update version to 2.9.92
diff --git a/NEWS b/NEWS
index c8ff34b47..066d234f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+gnome-control-center 2.9.92
+
+general:
+- do not warn vnc users that their XKB does not work.  We already know.
+
+------------------------------------------------------------------------------
 gnome-control-center 2.9.91
 
 general:
diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
index 073f508f8..8664b287a 100644
--- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
+++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
@@ -85,13 +85,19 @@ gnome_settings_keyboard_log_appender (const char file[], const char function[],
 static void
 activation_error (void)
 {
-	char *vendor = ServerVendor (GDK_DISPLAY ());
+	char const *vendor = ServerVendor (GDK_DISPLAY ());
 	int release = VendorRelease (GDK_DISPLAY ());
-	gboolean badXFree430Release = (!strcmp (vendor,
-						"The XFree86 Project, Inc"))
+	gboolean badXFree430Release = (vendor != NULL)
+	    && (0 == strcmp (vendor, "The XFree86 Project, Inc"))
 	    && (release / 100000 == 403);
 
-	GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL,
+	GtkWidget *dialog;
+	
+	/* VNC viewers will not work, do not barrage them with warnings */
+	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
+	    return;
+
+	dialog = gtk_message_dialog_new_with_markup (NULL,
 							     0,
 							     GTK_MESSAGE_ERROR,
 							     GTK_BUTTONS_CLOSE,
@@ -116,9 +122,9 @@ activation_error (void)
 							     : "",
 							     "<b>xprop -root | grep XKB</b>",
 							     "<b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd</b>");
-	g_signal_connect (msg, "response",
+	g_signal_connect (dialog, "response",
 			  G_CALLBACK (gtk_widget_destroy), NULL);
-	gtk_widget_show (msg);
+	gtk_widget_show (dialog);
 }
 
 static void