diff --git a/packages/mediacenter/xbmc/config/appliance.xml b/packages/mediacenter/xbmc/config/appliance.xml
new file mode 100644
index 0000000000..d9aff2f289
--- /dev/null
+++ b/packages/mediacenter/xbmc/config/appliance.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+  <section id="system">
+    <category id="videoscreen">
+      <group id="1">
+        <setting id="videoscreen.screen">
+          <visible>false</visible>
+        </setting>
+      </group>
+    </category>
+  </section>
+
+  <section id="services">
+    <category id="airplay">
+      <group id="1">
+        <setting id="services.airplay">
+          <default>true</default>
+        </setting>
+      </group>
+    </category>
+
+    <category id="zeroconf">
+      <group id="1">
+        <setting id="services.zeroconf">
+          <default>true</default>
+        </setting>
+      </group>
+    </category>
+
+    <category id="webserver">
+      <group id="1">
+        <setting id="services.webserver">
+          <default>true</default>
+        </setting>
+      </group>
+    </category>
+  </section>
+
+</settings>
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 19dfc2172d..37bfa71b3b 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -105,6 +105,15 @@ mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
       cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/
     fi
 
+if [ "$XBMC" = master ]; then
+  mkdir -p $INSTALL/usr/share/xbmc/system/settings
+    if [ -f $PROJECT_DIR/$PROJECT/xbmc/appliance.xml ]; then
+      cp $PROJECT_DIR/$PROJECT/xbmc/appliance.xml $INSTALL/usr/share/xbmc/system/settings
+    else
+      cp $PKG_DIR/config/appliance.xml $INSTALL/usr/share/xbmc/system/settings
+    fi
+fi
+
 if [ "$XBMC_EXTRA_FONTS" = yes ]; then
   mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
     cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts