Index: mamesettingsdlg.cpp
===================================================================
--- mamesettingsdlg.cpp	(revision 7109)
+++ mamesettingsdlg.cpp	(working copy)
@@ -311,11 +311,20 @@
         addSelection(QObject::tr("No Joystick"), "0");
         addSelection(QObject::tr("i386 Joystick"), "1");
         addSelection(QObject::tr("Fm Town Pad"), "2");
-        addSelection(QObject::tr("X11 Input Extension Joystick"), "3");
-        addSelection(QObject::tr("New i386 linux 1.x.x Joystick"), "4");
-        addSelection(QObject::tr("NetBSD USB Joystick"), "5");
-        addSelection(QObject::tr("PS2-Linux native pad"), "6");
-        addSelection(QObject::tr("SDL Joystick"), "7");
+	if (atoi(prefs->xmame_minor) < 88)
+	{
+            addSelection(QObject::tr("X11 Input Extension Joystick"), "3");
+            addSelection(QObject::tr("New i386 linux 1.x.x Joystick"), "4");
+            addSelection(QObject::tr("NetBSD USB Joystick"), "5");
+            addSelection(QObject::tr("PS2-Linux native pad"), "6");
+            addSelection(QObject::tr("SDL Joystick"), "7");
+	}
+	else
+	{
+            addSelection(QObject::tr("NetBSD USB Joystick"), "3");
+            addSelection(QObject::tr("PS2-Linux native pad"), "4");
+            addSelection(QObject::tr("SDL Joystick"), "5");
+	}
         setHelpText(QObject::tr("Select type of joystick support to use"));
     };
 };