diff --git a/packages/audio/libvorbis/meta b/packages/audio/libvorbis/meta
index 7b581204be..bd58d32e2d 100644
--- a/packages/audio/libvorbis/meta
+++ b/packages/audio/libvorbis/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="libvorbis"
-PKG_VERSION="1.3.2"
+PKG_VERSION="1.3.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.vorbis.com/"
-PKG_URL="http://downloads.xiph.org/releases/vorbis/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://downloads.xiph.org/releases/vorbis/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="libogg"
 PKG_BUILD_DEPENDS="toolchain libogg"
 PKG_PRIORITY="optional"
diff --git a/packages/audio/libvorbis/patches/libvorbis-1.3.2-configure.patch b/packages/audio/libvorbis/patches/libvorbis-1.3.3-configure.patch
similarity index 100%
rename from packages/audio/libvorbis/patches/libvorbis-1.3.2-configure.patch
rename to packages/audio/libvorbis/patches/libvorbis-1.3.3-configure.patch
diff --git a/packages/compress/lzo/build b/packages/compress/lzo/build
index 4c3ce5525d..a98924913f 100755
--- a/packages/compress/lzo/build
+++ b/packages/compress/lzo/build
@@ -23,14 +23,16 @@
 . config/options $1
 
 cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --exec-prefix=/usr \
-            --sysconfdir=/etc \
-            --datadir=/usr/share \
-            --enable-shared \
-            --disable-static \
+
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --exec-prefix=/usr \
+             --sysconfdir=/etc \
+             --datadir=/usr/share \
+             --enable-shared \
+             --disable-static \
 
 make
 
diff --git a/packages/compress/lzo/install b/packages/compress/lzo/install
index fd3516759f..7ba56ad3c8 100755
--- a/packages/compress/lzo/install
+++ b/packages/compress/lzo/install
@@ -23,5 +23,5 @@
 . config/options $1
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/.build-target/src/.libs/*.so* $INSTALL/usr/lib
 
diff --git a/packages/devel/pcre/meta b/packages/devel/pcre/meta
index 64d19e53df..7a6baec9ad 100644
--- a/packages/devel/pcre/meta
+++ b/packages/devel/pcre/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcre"
-PKG_VERSION="8.21"
+PKG_VERSION="8.30"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta
index 1c88892719..037170f965 100644
--- a/packages/graphics/libdrm/meta
+++ b/packages/graphics/libdrm/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.30"
+PKG_VERSION="2.4.31"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
index b681b8a5f7..ba38b163e8 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
@@ -11,11 +11,13 @@
              library="default.py" />
   <extension point="xbmc.addon.metadata">
     <summary lang="en">OpenELEC OS Settings Dialog</summary>
+    <summary lang="da">OpenELEC OS Indstillinger</summary>
     <summary lang="tr">OpenELEC OS Ayarları İletişim Kutusu</summary>
     <summary lang="pl">OpenELEC OS Panel ustawień</summary>
     <description lang="en">OpenElec OS Settings Dialog</description>
+    <description lang="da">OpenElec OS Indstillinger</description>
     <description lang="tr">OpenElec OS Ayarları İletişim Kutusu</description>
     <description lang="pl">OpenELEC OS Panel ustawień</description>
     <platform>all</platform>
   </extension>
-</addon>
+</addon>
\ No newline at end of file
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
new file mode 100644
index 0000000000..8bb4f3b3e8
--- /dev/null
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+
+	<!-- System -->
+	<string id="2000">System</string>
+	<string id="2010">Tastatur</string>
+	<string id="2011">Tastatur layout</string>
+	<string id="2012">Alternativ tastatur layout (valgfrit)</string>
+	<string id="2020">System Opdatering</string>
+	<string id="2021">System Opdatering</string>
+	<string id="2050">LCD/VFD</string>
+	<string id="2051">Valg af LCD driver</string>
+
+	<!-- Network -->
+	<string id="2100">Netværk</string>
+	<string id="2101">Netværk 2</string>
+	<string id="2110">Generelle indstillinger</string>
+	<string id="2111">Hostnavn</string>
+	<string id="2120">Netværks Adapter</string>
+	<string id="2121">Netværks forbindelse</string>
+	<string id="2122">Netværks Interface</string>
+	<string id="2130">IP indstillinger</string>
+	<string id="2131">Statisk IP adresse</string>
+	<string id="2132">Netmaske Præfixlængde</string>
+	<string id="2133">Netværks gateway</string>
+	<string id="2134">DNS server 1</string>
+	<string id="2135">DNS server 2</string>
+	<string id="2136">DNS server 3</string>
+	<string id="2150">WLAN indstillinger</string>
+	<string id="2151">WLAN SSID</string>
+	<string id="2152">Skjult Netværk</string>
+	<string id="2153">WLAN Sikkerhed</string>
+	<string id="2154">WLAN Kodeord</string>
+
+	<!-- SAMBA -->
+	<string id="5000">Samba</string>
+	<string id="5010">Opstart</string>
+	<string id="5011">Start Samba ved opstart af systemet</string>
+
+</strings>
diff --git a/packages/toolchain/archivers/lzo-host/build b/packages/toolchain/archivers/lzo-host/build
new file mode 100755
index 0000000000..15ff03ca91
--- /dev/null
+++ b/packages/toolchain/archivers/lzo-host/build
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+$SCRIPTS/unpack lzo
+
+LZO_DIR=`ls -d $BUILD/lzo-[0-9]*`
+
+setup_toolchain host
+
+cd $LZO_DIR
+
+mkdir -p .build-host && cd .build-host
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
+             --sysconfdir=$ROOT/$TOOLCHAIN/etc \
+             --datadir=/usr/share \
+             --enable-shared \
+             --disable-static \
+
+make
+make install
diff --git a/packages/toolchain/devel/autotools/automake/meta b/packages/toolchain/devel/autotools/automake/meta
index fd308b319a..61f85dad13 100644
--- a/packages/toolchain/devel/autotools/automake/meta
+++ b/packages/toolchain/devel/autotools/automake/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="automake"
-PKG_VERSION="1.11.2"
+PKG_VERSION="1.11.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/automake/"
-PKG_URL="http://ftp.gnu.org/gnu/automake/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnu.org/gnu/automake/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache autoconf"
 PKG_PRIORITY="optional"
diff --git a/packages/toolchain/devel/autotools/intltool/meta b/packages/toolchain/devel/autotools/intltool/meta
index 34a0514527..d258d73a83 100644
--- a/packages/toolchain/devel/autotools/intltool/meta
+++ b/packages/toolchain/devel/autotools/intltool/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="intltool"
-PKG_VERSION="0.50.0"
+PKG_VERSION="0.50.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/toolchain/sysutils/squashfs/build b/packages/toolchain/sysutils/squashfs/build
index b023deaf4b..0edf6af065 100755
--- a/packages/toolchain/sysutils/squashfs/build
+++ b/packages/toolchain/sysutils/squashfs/build
@@ -29,6 +29,7 @@ LDFLAGS="$LDFLAGS -fwhole-program"
 cd $BUILD/$1*/squashfs-tools
 make mksquashfs \
      XZ_SUPPORT=1 \
+     LZO_SUPPORT=1 \
      INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include"
 
 mkdir -p $ROOT/$TOOLCHAIN/bin
diff --git a/packages/toolchain/sysutils/squashfs/meta b/packages/toolchain/sysutils/squashfs/meta
index 7f537c7f12..3e5c904446 100644
--- a/packages/toolchain/sysutils/squashfs/meta
+++ b/packages/toolchain/sysutils/squashfs/meta
@@ -27,7 +27,7 @@ PKG_SITE="http://squashfs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz"
 #PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache zlib-host xz"
+PKG_BUILD_DEPENDS="ccache zlib-host lzo-host xz"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/sysutils"
 PKG_SHORTDESC="squashfs-tools: A compressed read-only filesystem for Linux"
diff --git a/packages/x11/lib/pixman/meta b/packages/x11/lib/pixman/meta
index 5b2860ac62..4fd06c6701 100644
--- a/packages/x11/lib/pixman/meta
+++ b/packages/x11/lib/pixman/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pixman"
-PKG_VERSION="0.24.2"
+PKG_VERSION="0.24.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index a71ae7122d..c8ca5762a7 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
diff --git a/projects/ATV/options b/projects/ATV/options
index 36567f5739..115edb0ba0 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 0dae63bad3..b7cb964bc9 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2260,6 +2259,7 @@ CONFIG_SND_DMA_SGBUF=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_MPU401_UART=m
 CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_PCI=y
@@ -2278,6 +2278,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_BT87X is not set
 CONFIG_SND_CA0106=m
 # CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
 # CONFIG_SND_OXYGEN is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
@@ -2902,7 +2903,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index 69338a2835..7328f88d14 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -2206,6 +2206,7 @@ CONFIG_SND_DMA_SGBUF=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_MPU401_UART=m
 CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_PCI=y
@@ -2224,6 +2225,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_BT87X is not set
 CONFIG_SND_CA0106=m
 # CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
 # CONFIG_SND_OXYGEN is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
@@ -2847,7 +2849,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Fusion/options b/projects/Fusion/options
index b06c45c4b6..57115788ed 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index d6e71db055..cd9cf19991 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -3091,7 +3090,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Generic/options b/projects/Generic/options
index 173be2ffbe..2002b84dd3 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 8778b58609..6830c46a75 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -3093,7 +3092,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 101a051d12..56c380e130 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 6e49568410..29e906c7d9 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2880,7 +2879,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index c858e43114..f341c25d31 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2818,7 +2817,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/ION/options b/projects/ION/options
index e76a8da5a4..117d43a77e 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 2354be5d68..b98e18d59b 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -98,7 +98,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2940,7 +2939,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 74f124d9b2..e975cab841 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2879,7 +2878,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Intel/options b/projects/Intel/options
index 1e67c5427b..651d82b5ae 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index 8fea1bbcbd..7ff5e9f35c 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -100,7 +100,6 @@ CONFIG_SPARSE_IRQ=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
@@ -2653,7 +2652,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_XATTR is not set
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 5e843cb426..1ff8f2cb66 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -107,6 +107,9 @@
 # use linux-next (latest rc) instead latest released version
   LINUX_NEXT="no"
 
+# SquashFS compression method (gzip / lzo / xz)
+  SQUASHFS_COMPRESSION="gzip"
+
 # Mediacenter to use (xbmc / no)
   if [ "$PVR" = yes ]; then
     MEDIACENTER="xbmc-pvr"
diff --git a/scripts/image b/scripts/image
index 59af405527..36c376a502 100755
--- a/scripts/image
+++ b/scripts/image
@@ -185,9 +185,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
 
 # create squashfs file
+  if [ -z "$SQUASHFS_COMPRESSION" ]; then
+    SQUASHFS_COMPRESSION="gzip"
+  fi
+
   echo "rm -rf $TARGET_IMG/$IMAGE_NAME.system" >> $FAKEROOT_SCRIPT
-#  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend -comp xz" >> $FAKEROOT_SCRIPT
-  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend" >> $FAKEROOT_SCRIPT
+  echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$IMAGE_NAME.system -noappend -comp $SQUASHFS_COMPRESSION" >> $FAKEROOT_SCRIPT
 
 # run fakeroot
   $ROOT/$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT