diff --git a/src/jstk.c b/src/jstk.c
index 33c8e5c..10add2d 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -501,7 +501,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     local->fd = -1;
     local->dev = NULL;
     local->private = priv;
-    local->type_name = XI_MOUSE;
+    local->type_name = XI_JOYSTICK;
     local->history_size = 0;
     local->always_core_feedback = 0;
     local->conf_idev = dev;
diff --git a/src/jstk.h b/src/jstk.h
index fb600ff..03f896a 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -25,6 +25,7 @@
 #define __JSTK_H_INCLUDED__
 
 #include <xf86Xinput.h>
+#include <X11/extensions/XIproto.h>
 
 
 #define MAXBUTTONS 32
@@ -47,6 +48,12 @@
     #define DBG(lvl, f)
 #endif
 
+
+#ifndef XI_JOYSTICK
+#define XI_JOYSTICK "JOYSTICK"
+#endif
+
+
 typedef enum _JOYSTICKEVENT {
     EVENT_NONE=0,
     EVENT_BUTTON,