diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 5ab7005..3174257 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1223,8 +1223,12 @@ main (gint argc, gchar **argv)
     }
     
     /* check for Xi 1.4 */
+#ifndef XInput_2
     version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+#else
+    version = XQueryInputVersion (GDK_DISPLAY (), XI_2_Major, XI_2_Minor);
+#endif
+    if (!version || !version->present || (version->major_version == 1 && version->minor_version < 4) || version->major_version < 0)
     {
         g_critical ("XI is not present or too old.");
         
diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c
index d2484a4..27fbed7 100644
--- a/xfce4-settings-helper/pointers.c
+++ b/xfce4-settings-helper/pointers.c
@@ -135,10 +135,14 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
     xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
     
     /* query the extension version */
+#ifndef XInput_2
     version = XGetExtensionVersion (xdisplay, INAME);
-    
+#else
+    version = XQueryInputVersion (GDK_DISPLAY (), XI_2_Major, XI_2_Minor);
+#endif
+
     /* check for Xi 1.4 */
-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+    if (!version || !version->present || (version->major_version == 1 && version->minor_version < 4) || version->major_version < 0)
     {
         /* print error */
         g_critical ("XI is not present or too old.");