diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build
index f7e11e11f5..d1b1c7f2a5 100755
--- a/packages/devel/ncurses/build
+++ b/packages/devel/ncurses/build
@@ -27,12 +27,14 @@ CWD=`pwd`
 setup_toolchain host
 
 cd $PKG_BUILD/ncurses-host
-./configure
+./configure --prefix=$ROOT/$TOOLCHAIN \
+            --with-shared \
 
 make -C include
 make -C progs tic
 
 cp progs/tic $ROOT/$TOOLCHAIN/bin
+cp lib/*.so* $ROOT/$TOOLCHAIN/lib
 
 cd "$CWD"
 
diff --git a/packages/lang/Python/build b/packages/lang/Python/build
index bd93bba952..8262b4f9e4 100755
--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@@ -40,10 +40,10 @@ LDFLAGS="$LDFLAGS -lexpat" \
              --enable-unicode=ucs4 \
 
 make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
-     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib"
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64"
 
 make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
-     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \
+     PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib /usr/lib64 /lib /lib64" \
      install
 
 # symlink python binary to python2 (needed for Mesa)
diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta
index 07fd705750..2d624d1725 100644
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/packages/linux-firmware/wlan-firmware/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.3"
+PKG_VERSION="0.0.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 9001b2ba8f..c71e76862d 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="57e5b66"
+PKG_VERSION="e1a0b08"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 6102e958fc..39a2f0c32e 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="57e5b66"
+PKG_VERSION="e1a0b08"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
 PKG_PRIORITY="optional"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-201-let_select_XBMCProjectM-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-201-let_select_XBMCProjectM-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-201-let_select_XBMCProjectM-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-202-let_select_RSXS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-202-let_select_RSXS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-202-let_select_RSXS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-453-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-453-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-453-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-464-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-57e5b66-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-e1a0b08-901-advancedsettings_alwaysextractflags.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-57e5b66-901-advancedsettings_alwaysextractflags.patch
rename to packages/mediacenter/xbmc/patches/xbmc-e1a0b08-901-advancedsettings_alwaysextractflags.patch
diff --git a/packages/web/curl/meta b/packages/web/curl/meta
index f5b1061246..ffc7676ca4 100644
--- a/packages/web/curl/meta
+++ b/packages/web/curl/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="curl"
-PKG_VERSION="7.21.6"
+PKG_VERSION="7.21.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/web/curl/patches/curl-7.21.6-0108-threaded_dns_multi.patch b/packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch
similarity index 100%
rename from packages/web/curl/patches/curl-7.21.6-0108-threaded_dns_multi.patch
rename to packages/web/curl/patches/curl-7.21.7-0108-threaded_dns_multi.patch
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index cbfa1f26d2..97af618a89 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -2244,8 +2244,9 @@ CONFIG_STAGING=y
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_R8187SE is not set
diff --git a/projects/ATV/options b/projects/ATV/options
index 1eefdccba3..6074fa672f 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -118,10 +118,9 @@
 
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"
 
 # build with network support (yes / no)
   NETWORK="yes"
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index f09f64f67c..9c1de32dab 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -2429,8 +2429,9 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/Fusion/options b/projects/Fusion/options
index bf9aaa7b14..7c93dbdb45 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -118,10 +118,9 @@
 
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"
 
 # build with network support (yes / no)
   NETWORK="yes"
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 704f9650fc..816d560756 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2674,9 +2674,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/Generic/options b/projects/Generic/options
index fe1ae23b98..ca85bab503 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -118,10 +118,9 @@
 
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"
 
 # build with network support (yes / no)
   NETWORK="yes"
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 4088e667cd..bed13f44f0 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -2519,9 +2519,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 28702ffd60..79c1ec874d 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -2455,9 +2455,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/ION/options b/projects/ION/options
index a695a0906e..73675445da 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -118,10 +118,9 @@
 
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"
 
 # build with network support (yes / no)
   NETWORK="yes"
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index b22ff45e95..bf55c1ca6b 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -2566,9 +2566,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 20f5acb9c1..03addf6ed1 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -2507,9 +2507,10 @@ CONFIG_DVB_CXD2099=m
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
diff --git a/projects/Intel/options b/projects/Intel/options
index a24d037b7f..a5465b1f51 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -118,10 +118,9 @@
 
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
-# bcm_sta:          Broadcom STA WLAN Driver
 # Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="bcm_sta"
-  ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta"
+# e.g. ADDITIONAL_DRIVERS="asix-ax887xx"
+  ADDITIONAL_DRIVERS="asix-ax887xx"
 
 # build with network support (yes / no)
   NETWORK="yes"
diff --git a/scripts/checkdeps b/scripts/checkdeps
index 26fa0245f2..8f08015c9a 100755
--- a/scripts/checkdeps
+++ b/scripts/checkdeps
@@ -35,8 +35,8 @@ case $1 in
   build)
     deps="gcc g++ sed patch touch tar bzip2 gzip lzma perl cp gawk makeinfo gettext autopoint gperf autoconf automake m4 cvs zip unzip mkfontscale libtool diff xsltproc msgfmt"
     deps_pkg="gcc g++ sed patch fileutils tar bzip2 gzip lzma perl coreutils gawk texinfo gettext gettext-devel gperf autoconf automake m4 cvs zip unzip xutils libtool diff xsltproc gettext"
-    files="/usr/lib/libc.a /usr/include/stdio.h /usr/include/ncurses.h"
-    files_pkg="glibc-static libc6-dev libncurses5-dev"
+    files="/usr/include/stdio.h /usr/include/ncurses.h"
+    files_pkg="libc6-dev libncurses5-dev"
     ;;
   qemu)
     if [ ! `which qemu` ]; then
diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc
index 1f1d3ee8da..9c6d14ec18 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_xbmc
@@ -68,8 +68,8 @@ echo "cleaning sources..."
   rm -r $PKG_NAME-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
 
 echo "packing sources..."
-  tar cvjf $PKG_NAME-$GIT_REV.tar.bz2 $PKG_NAME-$GIT_REV
-  tar cvjf $PKG_NAME-theme-Confluence-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$GIT_REV
+  tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV
+  tar cvJf $PKG_NAME-theme-Confluence-$GIT_REV.tar.xz $PKG_NAME-theme-Confluence-$GIT_REV
 
 echo "remove temporary sourcedir..."
   rm -rf $PKG_NAME-$GIT_REV