diff --git a/packages/addons/service/multimedia/boblightd/addon b/packages/addons/service/multimedia/boblightd/addon
index 18ea38049b..b9b13964a1 100755
--- a/packages/addons/service/multimedia/boblightd/addon
+++ b/packages/addons/service/multimedia/boblightd/addon
@@ -30,7 +30,13 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  fi
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  cp -R $PKG_DIR/config/boblight.conf.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  fi
+
diff --git a/packages/addons/service/multimedia/boblightd/build b/packages/addons/service/multimedia/boblightd/build
index b48f301cfe..1577e5ab71 100755
--- a/packages/addons/service/multimedia/boblightd/build
+++ b/packages/addons/service/multimedia/boblightd/build
@@ -27,6 +27,11 @@
 if [ ! "$OPENGL_SUPPORT" = "yes" ] ; then
   EXTRAOPTS="--without-opengl"
 fi
+
+if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
+  EXTRAOPTS="$EXTRAOPTS --without-x11"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt
index 5824139fca..d4f39226f5 100644
--- a/packages/addons/service/multimedia/boblightd/changelog.txt
+++ b/packages/addons/service/multimedia/boblightd/changelog.txt
@@ -1,5 +1,6 @@
 3.0.1
 - bump addon version
+- make OpenGL and X11 support optional
 
 2.1.3
 - update to boblightd-449
diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta
index 91c9277a5f..f25afe5505 100644
--- a/packages/addons/service/multimedia/boblightd/meta
+++ b/packages/addons/service/multimedia/boblightd/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libX11 libXext libX11 libXrender Mesa"
-PKG_BUILD_DEPENDS="toolchain libX11 libXext libXrender Mesa"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="boblightd: an ambilight controller."
@@ -36,3 +36,13 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="yes"
+
+if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext libXrender Mesa"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext libXrender Mesa"
+fi
+
+if [ "$OPENGL_SUPPORT" = "yes" ] ; then
+  PKG_DEPENDS="$PKG_DEPENDS Mesa"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa"
+fi