diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 4202be5843..7c9218a4ac 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -14,7 +14,6 @@ $SCRIPTS/build alsa-lib
 $SCRIPTS/build libass
 $SCRIPTS/build enca #libass?
 $SCRIPTS/build curl
-$SCRIPTS/build libmicrohttpd
 $SCRIPTS/build libssh
 
 $SCRIPTS/build dbus
@@ -64,6 +63,13 @@ else
   XBMC_AVAHI="--disable-avahi"
 fi
 
+if [ "$WEBSERVER" = yes ]; then
+  $SCRIPTS/build libmicrohttpd
+  XBMC_WEBSERVER="--enable-webserver"
+else
+  XBMC_WEBSERVER="--disable-webserver"
+fi
+
 if [ "$VDPAU" = yes ]; then
   $SCRIPTS/build libvdpau
   XBMC_VDPAU="--enable-vdpau"
@@ -130,7 +136,7 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag
             --disable-hal \
             --enable-non-free \
             --disable-asap-codec \
-            --enable-webserver \
+            $XBMC_WEBSERVER \
             --disable-libdts \
             --disable-liba52 \
             --disable-external-ffmpeg \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 5f8569d171..806e5efd13 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -12,7 +12,6 @@ $SCRIPTS/install alsa-lib
 $SCRIPTS/install libass
 $SCRIPTS/install enca #libass
 $SCRIPTS/install curl
-$SCRIPTS/install libmicrohttpd
 $SCRIPTS/install libssh
 
 $SCRIPTS/install dbus
@@ -60,6 +59,7 @@ $SCRIPTS/install samba
 [ "$VAAPI" = yes ] && $SCRIPTS/install libva
 [ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd
 [ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
+[ "$WEBSERVER" = yes ] && $SCRIPTS/install libmicrohttpd
 [ "$UDISKS" = yes ] && $SCRIPTS/install udisks
 [ "$UPOWER" = yes ] && $SCRIPTS/install upower
 [ "$UPOWER" = yes ] && $SCRIPTS/install ConsoleKit
diff --git a/projects/ION/options b/projects/ION/options
index a7b879774d..670945c172 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -68,6 +68,9 @@
 # build with network support (yes / no)
   NETWORK="yes"
 
+# build and install with XBMC webfrontend (yes / no)
+  WEBSERVER="yes"
+
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
diff --git a/projects/generic/options b/projects/generic/options
index e30c5e8814..dbdf98fc60 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -68,6 +68,9 @@
 # build with network support (yes / no)
   NETWORK="yes"
 
+# build and install with XBMC webfrontend (yes / no)
+  WEBSERVER="yes"
+
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
diff --git a/projects/intel/options b/projects/intel/options
index 326d63ff71..30f7072d8f 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -68,6 +68,9 @@
 # build with network support (yes / no)
   NETWORK="yes"
 
+# build and install with XBMC webfrontend (yes / no)
+  WEBSERVER="yes"
+
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"