diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index e2dd209858..e92a38918f 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -56,6 +56,12 @@ else
   XBMC_CEC="--disable-libcec --disable-udev --disable-libusb"
 fi
 
+if [ "$JOYSTICK_SUPPORT" = yes ]; then
+  XBMC_JOYSTICK="--enable-joystick"
+else
+  XBMC_JOYSTICK="--disable-joystick"
+fi
+
 if [ "$NONFREE_SUPPORT" = yes ]; then
   XBMC_NONFREE="--enable-non-free"
 else
@@ -200,7 +206,7 @@ cd $PKG_BUILD
             --disable-openmax \
             --disable-tegra \
             --disable-profiling \
-            --enable-joystick \
+            $XBMC_JOYSTICK \
             $XBMC_CEC \
             $XBMC_GOOM \
             $XBMC_RSXS \