diff --git a/joystick/Makefile b/joystick/Makefile
index e56e760..fd3ab07 100644
--- a/joystick/Makefile
+++ b/joystick/Makefile
@@ -3,12 +3,13 @@ TOPDIR = ..
 
 include $(TOPDIR)/defaults.mk
 
-SRC  = joystick.c
 SRC_SIM =
 
-ifeq ($(JOYSTICK_TYPE), JOYSTICK_NES)
+ifeq ($(NES_PAD_SUPPORT), y)
   SRC = nes_pad.c
 endif
-
+ifeq ($(PARALLEL_JOYSTICK_SUPPORT), y)
+  SRC  = joystick.c
+endif
 
 include $(TOPDIR)/rules.mk
diff --git a/joystick/config.in b/joystick/config.in
index d0e1e62..708fc33 100644
--- a/joystick/config.in
+++ b/joystick/config.in
@@ -1,11 +1,5 @@
 dep_bool_menu "joystick support" JOYSTICK_SUPPORT y
 
-choice 'Joystick type'			\
-   "NES-Pad  JOYSTICK_NES \
-    Parallel  JOYSTICK_PARALLEL" \
-   'JOYSTICK_PARALLEL' JOYSTICK_TYPE
-
-
 ###################### Parallel joystick menu #################################
 dep_bool_menu "parallel joystick support" PARALLEL_JOYSTICK_SUPPORT y