diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 7c9218a4ac..3884b5899f 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -56,6 +56,12 @@ $SCRIPTS/build sqlite
 $SCRIPTS/build mysql #lib  #?
 $SCRIPTS/build samba #lib
 
+if [ "$NONFREE_SUPPORT" = yes ]; then
+  XBMC_NONFREE="--enable-non-free"
+else
+  XBMC_NONFREE="--disable-non-free"
+fi
+
 if [ "$AVAHI_DAEMON" = yes ]; then
   $SCRIPTS/build avahi
   XBMC_AVAHI="--enable-avahi"
@@ -134,7 +140,7 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag
             --disable-mid \
             $XBMC_AVAHI \
             --disable-hal \
-            --enable-non-free \
+            $XBMC_NONFREE \
             --disable-asap-codec \
             $XBMC_WEBSERVER \
             --disable-libdts \
diff --git a/projects/ION/options b/projects/ION/options
index 670945c172..f765bbba61 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -65,6 +65,10 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install with non-free support
+# (RAR compression support in XBMC) (yes / no)
+  NONFREE_SUPPORT="yes"
+
 # build with network support (yes / no)
   NETWORK="yes"
 
diff --git a/projects/generic/options b/projects/generic/options
index dbdf98fc60..afc408bf60 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -65,6 +65,10 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install with non-free support
+# (RAR compression support in XBMC) (yes / no)
+  NONFREE_SUPPORT="yes"
+
 # build with network support (yes / no)
   NETWORK="yes"
 
diff --git a/projects/intel/options b/projects/intel/options
index 30f7072d8f..ebe6dcdaff 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -65,6 +65,10 @@
 # e.g. XBMC_PLUGINS="SABnzbd"
   XBMC_PLUGINS=""
 
+# build and install with non-free support
+# (RAR compression support in XBMC) (yes / no)
+  NONFREE_SUPPORT="yes"
+
 # build with network support (yes / no)
   NETWORK="yes"