diff --git a/ChangeLog b/ChangeLog
index adb25286f..25be79bc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* hw/xfree86/utils/xorgcfg/keyboard-cfg.c:
 	Coverity #1216: Fix double-close of file on error.
 
+	* xkb/xkbEvents.c:
+	Coverity #987: Avoid potential NULL dereference.
+
 2006-04-06  Keith Packard  <keithp@keithp.com>
 
 	* fb/fbstipple.c: (fbEvenStipple):
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 8305208a0..6afe7874b 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -214,6 +214,10 @@ int		i;
 CARD32 		changedControls;
 
     changedControls= 0;
+
+    if (!kbd || !kbd->kbdfeed)
+        return 0;
+    
     if (old->enabled_ctrls!=new->enabled_ctrls)
 	changedControls|= XkbControlsEnabledMask;
     if ((old->repeat_delay!=new->repeat_delay)||