diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index e8d9344412..d3d3d5fe38 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -36,6 +36,7 @@
   IMAGE_KERNEL="KERNEL"
   IMAGE_SYSTEM="SYSTEM"
 
+  BOOT_STEP="start"
   REBOOT="0"
   MD5_FAILED="0"
   MD5_NOCHECK="0"
@@ -43,6 +44,7 @@
 
   NBD_DEVS="0"
   FLASH_FREE_MIN="5"
+  LIVE_FLASH_FREE_MIN="50"
 
   INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
   SYSTEM_TORAM_LIMIT=1024000
@@ -292,6 +294,9 @@
       NFS=*)
         MOUNT_CMD="mount_nfs"
         ;;
+      FILE=*)
+        MOUNT_CMD="mount_common"
+        ;;
       *)
         error "mount_part" "Unknown filesystem $1"
         ;;
@@ -304,7 +309,10 @@
       echo "updating $1..."
         $IONICE /bin/busybox mount -o remount,rw /flash
         $IONICE /bin/busybox mv $UPDATE_DIR/$2 $3
-        $IONICE /bin/busybox mount -o remount,ro /flash
+        # loopback file needs writable /flash all the time
+        if [ "${disk%%=*}" != "FILE" ]; then
+          $IONICE /bin/busybox mount -o remount,ro /flash
+        fi
         $IONICE /bin/busybox sync
     fi
   }
@@ -327,7 +335,6 @@
     fi
   }
 
-
   hfsdiskprep() {
     for DEVICE in /dev/sd*; do
       for device in $(/bin/busybox blkid $DEVICE); do
@@ -398,6 +405,65 @@
     progress "Mounting storage"
 
     if [ -n "$disk" ]; then
+      if [ "${disk%%=*}" = "FILE" ]; then
+        target="${disk%%,*}"
+        storage_loop_file="/flash/${target#*=}"
+        $IONICE /bin/busybox mount -o remount,rw /flash
+
+        if [ ! -f "$storage_loop_file" ]; then
+          echo "Creating storage loopback file: $storage_loop_file..."
+          STORAGE_USE=$(/bin/busybox df /flash/ | awk '/[0-9]%/{print $4}')
+          STORAGE_USE=$(($STORAGE_USE / 1024 - $LIVE_FLASH_FREE_MIN))
+
+          options="${disk#*,}"
+          if [ "$options" = "$disk" ]; then
+            echo "No size specified, using all available space..."
+            if [ $STORAGE_USE -gt 0 ]; then
+              echo "Size obtain: $STORAGE_USE MB..."
+            else
+              error "size check" "Not enough free space (at least $LIVE_FLASH_FREE_MIN MB)..."
+            fi
+          else
+            if [ $options -le $STORAGE_USE ]; then
+              STORAGE_USE=$options
+              echo "Size specified: $STORAGE_USE MB..."
+            else
+              echo "Incorrect specified size: $options MB > $STORAGE_USE MB..."
+              if [ $STORAGE_USE -gt 0 ]; then
+                echo "Size trimmed: $STORAGE_USE MB..."
+              else
+                error "size check" "Not enough free space (at least $LIVE_FLASH_FREE_MIN MB)..."
+              fi
+            fi
+          fi
+
+          if [ -f "/flash/$IMAGE_SYSTEM" ]; then
+            # /flash is filesystem with system image file
+            # use dd and mkfs.ext4 from system
+            mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
+            echo "Creating empty file, this can take a long time..."
+            /sysroot/bin/busybox dd if=/dev/zero of="$storage_loop_file" bs=1M count=$STORAGE_USE &>/dev/null
+            echo "Formating to EXT4 filesystem, this can take a long time..."
+            LD_LIBRARY_PATH=/sysroot/usr/lib /sysroot/usr/bin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
+            /bin/busybox sync
+            umount /sysroot
+          else
+            # /flash is actual root filesystem
+            echo "Creating empty file, this can take a long time..."
+            /flash/bin/busybox dd if=/dev/zero of="$storage_loop_file" bs=1M count=$STORAGE_USE &>/dev/null
+            echo "Formating to EXT4 filesystem, this can take a long time..."
+            LD_LIBRARY_PATH=/flash/usr/lib /flash/usr/bin/mkfs.ext4 -F -L StorageLive "$storage_loop_file" &>/dev/null
+            /bin/busybox sync
+          fi
+
+          echo "Done..."
+          /bin/busybox usleep 2000000
+        fi
+
+        mount_part "FILE=$storage_loop_file" "/storage" "loop,rw,noatime"
+        return
+      fi
+
       if [ -n "$OVERLAY" ]; then
         OVERLAY_DIR=`cat /sys/class/net/eth0/address | /bin/busybox tr -d :`
 
@@ -480,7 +546,7 @@
           /bin/busybox rm "$UPDATE_DIR/$UPDATE_SYSTEM"
           echo "md5 check failed. normal startup in 30s..."
           /bin/busybox sync
-        /bin/busybox usleep 30000000
+          /bin/busybox usleep 30000000
         fi
         /bin/busybox rm "$UPDATE_DIR/${UPDATE_KERNEL}.md5" &>/dev/null
         /bin/busybox rm "$UPDATE_DIR/${UPDATE_SYSTEM}.md5" &>/dev/null
@@ -496,7 +562,8 @@
     fi
 
     if test "$REBOOT" -eq "1"; then
-      echo "System reboots now..." && \
+      echo "System reboots now..."
+      /bin/busybox usleep 2000000
       /bin/busybox reboot
     fi
   }
@@ -526,6 +593,10 @@
     [ -f "/sysroot/sbin/init" ] || error "final_check" "Could not find system."
   }
 
+  if [ "${boot%%=*}" = "FILE" ]; then
+    error "check arguments" "boot argument can't be FILE type..."
+  fi
+
 # main boot sequence
   for BOOT_STEP in \
       load_modules \
diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-990.07-PR2449-2.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-990.07-PR2449-2.patch
new file mode 100644
index 0000000000..8183ed4e4a
--- /dev/null
+++ b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-990.07-PR2449-2.patch
@@ -0,0 +1,35 @@
+From efbf84893cb0d5d41232a29cd1f51f7d5cf53cb4 Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Sat, 16 Mar 2013 15:54:04 +0100
+Subject: [PATCH] skin.confluence: adjust row label 2 in VideoFullScreen to
+ line break in codec info
+
+---
+ addons/skin.confluence/720p/VideoFullScreen.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
+index 43cf714..8bdc8c8 100644
+--- a/720p/VideoFullScreen.xml
++++ b/720p/VideoFullScreen.xml
+@@ -339,7 +339,7 @@
+ 			<control type="label" id="11">
+ 				<description>row 2 label</description>
+ 				<posx>50</posx>
+-				<posy>40</posy>
++				<posy>55</posy>
+ 				<width>1180</width>
+ 				<height>30</height>
+ 				<align>left</align>
+@@ -350,7 +350,7 @@
+ 			<control type="label" id="12">
+ 				<description>row 3 label</description>
+ 				<posx>50</posx>
+-				<posy>85</posy>
++				<posy>100</posy>
+ 				<width>1180</width>
+ 				<height>30</height>
+ 				<align>left</align>
+-- 
+1.8.1.5
+
diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2449-1.patch b/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2449-1.patch
new file mode 100644
index 0000000000..9f56960ed2
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2449-1.patch
@@ -0,0 +1,26 @@
+From 3180ec7e5e065c0f9276a2d8999e8e8d997c4dba Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Sat, 16 Mar 2013 15:52:55 +0100
+Subject: [PATCH] dvdplayer: put line break into video codec info because it
+ gets too long
+
+---
+ xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
+index be89406..bb1fc42 100644
+--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
++++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
+@@ -2579,7 +2579,7 @@ void CDVDPlayer::GetVideoInfo(CStdString& strVideoInfo)
+   { CSingleLock lock(m_StateSection);
+     strVideoInfo.Format("D(%s)", m_StateInput.demux_video.c_str());
+   }
+-  strVideoInfo.AppendFormat(" P(%s)", m_dvdPlayerVideo.GetPlayerInfo().c_str());
++  strVideoInfo.AppendFormat("\nP(%s)", m_dvdPlayerVideo.GetPlayerInfo().c_str());
+ }
+ 
+ void CDVDPlayer::GetGeneralInfo(CStdString& strGeneralInfo)
+-- 
+1.8.1.5
+
diff --git a/packages/sysutils/bash/init.d/03_debugshell b/packages/sysutils/bash/init.d/03_debugshell
index 40c70c4d71..fa9205f45a 100644
--- a/packages/sysutils/bash/init.d/03_debugshell
+++ b/packages/sysutils/bash/init.d/03_debugshell
@@ -24,5 +24,6 @@
 TTY="3"
 
 if [ "$DEBUG" = "yes" ]; then
+  PS1="\007\]\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
   openvt -w -c $TTY /bin/sh &
 fi
diff --git a/packages/sysutils/bash/init.d/99_shell b/packages/sysutils/bash/init.d/99_shell
index f81366c2c2..21e3aed810 100644
--- a/packages/sysutils/bash/init.d/99_shell
+++ b/packages/sysutils/bash/init.d/99_shell
@@ -24,5 +24,6 @@
 TTY="1"
 
 while true; do
+  PS1="\007\]\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
   openvt -w -c $TTY /bin/sh
 done
diff --git a/packages/tools/syslinux/files/create_installstick b/packages/tools/syslinux/files/create_livestick
similarity index 72%
rename from packages/tools/syslinux/files/create_installstick
rename to packages/tools/syslinux/files/create_livestick
index c38058bc20..05d67a73d0 100755
--- a/packages/tools/syslinux/files/create_installstick
+++ b/packages/tools/syslinux/files/create_livestick
@@ -27,7 +27,7 @@ if [ "$(id -u)" != "0" ]; then
   clear
   echo "#########################################################"
   echo "# please execute with 'sudo' or -DANGEROUS!!!- as root  #"
-  echo "# example: sudo ./create_installstick <drive>           #"
+  echo "# example: sudo ./create_livestick <drive>           #"
   echo "#########################################################"
   exit 1
 fi
@@ -36,7 +36,7 @@ if [ -z "$1" ]; then
   clear
   echo "#########################################################"
   echo "# please execute with your drive as option              #"
-  echo "# example: sudo ./create_installstick /dev/sdb          #"
+  echo "# example: sudo ./create_livestick /dev/sdb          #"
   echo "#########################################################"
   exit 1
 fi
@@ -47,7 +47,7 @@ PART="${DISK}1"
 clear
 echo "#########################################################"
 echo "#                                                       #"
-echo "#             OpenELEC.tv USB Installer                 #"
+echo "#              OpenELEC LIVE Installer                  #"
 echo "#                                                       #"
 echo "#########################################################"
 echo "#                                                       #"
@@ -64,7 +64,7 @@ echo "#########################################################"
     clear
     echo "#########################################################"
     echo "#                                                       #"
-    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "# OpenELEC missing tool - Installation will quit        #"
     echo "#                                                       #"
     echo "#      We can't find the required tool \"syslinux\"       #"
     echo "#      on your system.                                  #"
@@ -80,7 +80,7 @@ echo "#########################################################"
     clear
     echo "#########################################################"
     echo "#                                                       #"
-    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "# OpenELEC missing tool - Installation will quit        #"
     echo "#                                                       #"
     echo "#      We can't find the required tool \"mcopy\"          #"
     echo "#      on your system.                                  #"
@@ -98,7 +98,7 @@ echo "#########################################################"
     clear
     echo "#########################################################"
     echo "#                                                       #"
-    echo "# OpenELEC.tv missing tool - Installation will quit     #"
+    echo "# OpenELEC missing tool - Installation will quit        #"
     echo "#                                                       #"
     echo "#      We can't find the required tool \"parted\"         #"
     echo "#      on your system.                                  #"
@@ -117,7 +117,7 @@ echo "#########################################################"
     clear
     echo "#########################################################"
     echo "#                                                       #"
-    echo "# OpenELEC.tv failed md5 check - Installation will quit #"
+    echo "# OpenELEC failed md5 check - Installation will quit    #"
     echo "#                                                       #"
     echo "#      Your original download was probably corrupt.     #"
     echo "#   Please visit www.openelec.tv and get another copy   #"
@@ -177,12 +177,42 @@ echo "#########################################################"
 # create bootloader configuration
   echo "creating bootloader configuration..."
 
-  echo "DEFAULT linux" > /tmp/usb_install/syslinux.cfg
+  echo "UI vesamenu.c32" > /tmp/usb_install/syslinux.cfg
   echo "PROMPT 0" >> /tmp/usb_install/syslinux.cfg
-  echo " " >> /tmp/usb_install/syslinux.cfg
-  echo "LABEL linux" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU TITLE OpenELEC LIVE Boot Menu" >> /tmp/usb_install/syslinux.cfg
+#  echo "MENU BACKGROUND splash.png" >> /tmp/usb_install/syslinux.cfg
+  echo "TIMEOUT 50" >> /tmp/usb_install/syslinux.cfg
+  echo "DEFAULT live" >> /tmp/usb_install/syslinux.cfg
+  echo "" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU WIDTH 78" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU MARGIN 4" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU ROWS 5" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU VSHIFT 10" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU TIMEOUTROW 13" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU TABMSGROW 11" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU CMDLINEROW 11" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU HELPMSGROW 16" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU HELPMSGENDROW 29" >> /tmp/usb_install/syslinux.cfg
+  echo "" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR border       30;44   #40ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR title        1;36;44 #9033ccff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR unsel        37;44   #50ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR help         37;40   #c0ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR msg07        37;40   #90ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "MENU COLOR tabmsg       31;40   #30ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
+  echo "" >> /tmp/usb_install/syslinux.cfg
+  echo "LABEL installer" >> /tmp/usb_install/syslinux.cfg
+  echo "  MENU LABEL Run OpenELEC Installer" >> /tmp/usb_install/syslinux.cfg
   echo "  KERNEL /KERNEL" >> /tmp/usb_install/syslinux.cfg
   echo "  APPEND boot=UUID=$UUID installer quiet" >> /tmp/usb_install/syslinux.cfg
+  echo "" >> /tmp/usb_install/syslinux.cfg
+  echo "LABEL live" >> /tmp/usb_install/syslinux.cfg
+  echo "  MENU LABEL Run OpenELEC Live" >> /tmp/usb_install/syslinux.cfg
+  echo "  KERNEL /KERNEL" >> /tmp/usb_install/syslinux.cfg
+  echo "  APPEND boot=UUID=$UUID disk=FILE=STORAGE quiet" >> /tmp/usb_install/syslinux.cfg
 
 # copy files
   echo "copying files to $PART..."
@@ -190,13 +220,16 @@ echo "#########################################################"
   cp target/KERNEL.md5 /tmp/usb_install
   cp target/SYSTEM /tmp/usb_install
   cp target/SYSTEM.md5 /tmp/usb_install
-  cp Autorun.inf /tmp/usb_install
+#  cp Autorun.inf /tmp/usb_install
   cp openelec.ico /tmp/usb_install
   cp CHANGELOG /tmp/usb_install
   cp INSTALL /tmp/usb_install
   cp README.md /tmp/usb_install
   cp RELEASE /tmp/usb_install
 
+  cp 3rdparty/syslinux/vesamenu.c32 /tmp/usb_install
+#  cp splash.png /tmp/usb_install
+
 # sync disk
   echo "syncing disk..."
   sync
diff --git a/packages/tools/syslinux/files/create_installstick.bat b/packages/tools/syslinux/files/create_livestick.bat
similarity index 56%
rename from packages/tools/syslinux/files/create_installstick.bat
rename to packages/tools/syslinux/files/create_livestick.bat
index ce7ac2043d..8b1de9aae4 100644
--- a/packages/tools/syslinux/files/create_installstick.bat
+++ b/packages/tools/syslinux/files/create_livestick.bat
@@ -1,5 +1,5 @@
 @ECHO OFF
-TITLE OpenELEC USB Installer
+TITLE OpenELEC LIVE USB Installer
 mode con:cols=67 lines=17
 COLOR 17
 SET DRIVE=
@@ -14,7 +14,7 @@ rmdir "%windir%\OEAdminCheck" & goto gotPrivileges
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
@@ -48,7 +48,7 @@ IF ERRORLEVEL 1 GOTO BadMD5
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
@@ -73,7 +73,7 @@ if %DRIVE%==C: goto InvalidDrive
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
@@ -99,19 +99,48 @@ IF ERRORLEVEL 1 goto InvalidDrive
 >NUL copy RELEASE %DRIVE%
 >NUL copy openelec.ico %DRIVE%
 FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
-ECHO DEFAULT linux > %DRIVE%\syslinux.cfg
+ECHO UI vesamenu.c32 > %DRIVE%\syslinux.cfg
 ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
+ECHO MENU TITLE OpenELEC LIVE Boot Menu >> %DRIVE%\syslinux.cfg
+ECHO TIMEOUT 50 >> %DRIVE%\syslinux.cfg
+ECHO DEFAULT live >> %DRIVE%\syslinux.cfg
 ECHO. >> %DRIVE%\syslinux.cfg
-ECHO LABEL linux >> %DRIVE%\syslinux.cfg
-ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
-ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
+ECHO MENU WIDTH 78 >> %DRIVE%\syslinux.cfg
+ECHO MENU MARGIN 4 >> %DRIVE%\syslinux.cfg
+ECHO MENU ROWS 5 >> %DRIVE%\syslinux.cfg
+ECHO MENU VSHIFT 10 >> %DRIVE%\syslinux.cfg
+ECHO MENU TIMEOUTROW 13 >> %DRIVE%\syslinux.cfg
+ECHO MENU TABMSGROW 11 >> %DRIVE%\syslinux.cfg
+ECHO MENU CMDLINEROW 11 >> %DRIVE%\syslinux.cfg
+ECHO MENU HELPMSGROW 16 >> %DRIVE%\syslinux.cfg
+ECHO MENU HELPMSGENDROW 29 >> %DRIVE%\syslinux.cfg
+ECHO. >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR border       30;44   #40ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR title        1;36;44 #9033ccff #a0000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR unsel        37;44   #50ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR help         37;40   #c0ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR msg07        37;40   #90ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
+ECHO MENU COLOR tabmsg       31;40   #30ffffff #00000000 std >> %DRIVE%\syslinux.cfg
+ECHO.  >> %DRIVE%\syslinux.cfg
+ECHO LABEL installer >> %DRIVE%\syslinux.cfg
+ECHO   MENU LABEL Run OpenELEC Installer >> %DRIVE%\syslinux.cfg
+ECHO   KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
+ECHO   APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
+ECHO. >> %DRIVE%\syslinux.cfg
+ECHO LABEL live >> %DRIVE%\syslinux.cfg
+ECHO   MENU LABEL Run OpenELEC Live >> %DRIVE%\syslinux.cfg
+ECHO   KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
+ECHO   APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet >> %DRIVE%\syslinux.cfg
 GOTO END
 
 :InvalidDrive
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
@@ -128,12 +157,12 @@ GOTO SelectDrive
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
 ECHO.
-ECHO     OpenELEC.tv failed md5 check - Installation will now quit
+ECHO       OpenELEC failed md5 check - Installation will now quit
 ECHO.
 ECHO             Your original download is probably corrupt
 ECHO       Please visit www.openelec.tv and download another copy
@@ -149,12 +178,12 @@ EXIT
 CLS
 ECHO.
 ECHO.
-ECHO                     OpenELEC.tv USB Installer
+ECHO                     OpenELEC LIVE USB Installer
 ECHO.
 ECHO.
 ECHO  *****************************************************************
 ECHO.
-ECHO    The OpenELEC USB Installer has been successfully copied to %DRIVE%
+ECHO  The OpenELEC LIVE USB Installer has been successfully copied to %DRIVE%
 ECHO             Please boot your HTPC off this USB stick
 ECHO.
 ECHO  *****************************************************************
diff --git a/packages/tools/syslinux/release b/packages/tools/syslinux/release
index 964f08e9db..ad9d02b56a 100755
--- a/packages/tools/syslinux/release
+++ b/packages/tools/syslinux/release
@@ -25,6 +25,7 @@
 mkdir -p $RELEASE_DIR/3rdparty/syslinux
   cp -PR $BUILD/syslinux-*/NEWS $RELEASE_DIR/3rdparty/syslinux
   cp -PR $BUILD/syslinux-*/README $RELEASE_DIR/3rdparty/syslinux
+  cp -PR $BUILD/syslinux-*/com32/menu/vesamenu.c32 $RELEASE_DIR/3rdparty/syslinux
 
 mkdir -p $RELEASE_DIR/3rdparty/syslinux/doc
   cp -PR $BUILD/syslinux-*/doc/* $RELEASE_DIR/3rdparty/syslinux/doc
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/meta b/packages/x11/driver/xf86-video-nvidia-legacy/meta
index 874cb62844..782f54b1b2 100644
--- a/packages/x11/driver/xf86-video-nvidia-legacy/meta
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia-legacy"
-PKG_VERSION="304.84"
+PKG_VERSION="304.64"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch
new file mode 100644
index 0000000000..852021d657
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/make-use-of-the-new-uapi-framework.patch
@@ -0,0 +1,46 @@
+From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Wed, 7 Nov 2012 12:03:46 +0100
+Subject: [PATCH 1/2] Make use of the new uapi framework
+
+---
+ conftest.sh |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 388e268..8eff4d7 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -20,6 +20,7 @@ ARCH=$3
+ ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
+ SOURCES=$4
+ HEADERS=$SOURCES/include
++HEADERSA=$SOURCES/include/uapi
+ OUTPUT=$5
+ XEN_PRESENT=1
+ 
+@@ -118,7 +119,7 @@ build_cflags() {
+         fi
+     fi
+ 
+-    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+ 
+     test_xen
+ 
+@@ -146,10 +147,10 @@ build_cflags() {
+         fi
+     fi
+ 
+-    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+ 
+     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
+     elif [ "$ARCH" = "arm" ]; then
+         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
+     fi
+-- 
+1.7.9.5
+
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
new file mode 100644
index 0000000000..84bd164e76
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
@@ -0,0 +1,28 @@
+From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Wed, 7 Nov 2012 12:11:02 +0100
+Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
+
+---
+ nv-mmap.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c
+index acc02ec..b2d5cdb 100644
+--- a/kernel/nv-mmap.c
++++ b/kernel/nv-mmap.c
+@@ -463,7 +463,11 @@ int nv_kern_mmap(
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+         nv_vm_list_page_count(&at->page_table[i], pages);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++        vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
++#else
+         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
++#endif
+ 
+ #if defined(VM_DRIVER_PAGES)
+         vma->vm_flags |= VM_DRIVER_PAGES;
+-- 
+1.7.9.5
+
diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index 7baba9f3ca..52bea1e52e 100644
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="304.84"
+PKG_VERSION="304.64"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch
new file mode 100644
index 0000000000..852021d657
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/make-use-of-the-new-uapi-framework.patch
@@ -0,0 +1,46 @@
+From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Wed, 7 Nov 2012 12:03:46 +0100
+Subject: [PATCH 1/2] Make use of the new uapi framework
+
+---
+ conftest.sh |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 388e268..8eff4d7 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -20,6 +20,7 @@ ARCH=$3
+ ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
+ SOURCES=$4
+ HEADERS=$SOURCES/include
++HEADERSA=$SOURCES/include/uapi
+ OUTPUT=$5
+ XEN_PRESENT=1
+ 
+@@ -118,7 +119,7 @@ build_cflags() {
+         fi
+     fi
+ 
+-    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+ 
+     test_xen
+ 
+@@ -146,10 +147,10 @@ build_cflags() {
+         fi
+     fi
+ 
+-    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+ 
+     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+-        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
+     elif [ "$ARCH" = "arm" ]; then
+         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
+     fi
+-- 
+1.7.9.5
+
diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
new file mode 100644
index 0000000000..84bd164e76
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
@@ -0,0 +1,28 @@
+From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone@canonical.com>
+Date: Wed, 7 Nov 2012 12:11:02 +0100
+Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
+
+---
+ nv-mmap.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c
+index acc02ec..b2d5cdb 100644
+--- a/kernel/nv-mmap.c
++++ b/kernel/nv-mmap.c
+@@ -463,7 +463,11 @@ int nv_kern_mmap(
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+         nv_vm_list_page_count(&at->page_table[i], pages);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++        vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
++#else
+         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
++#endif
+ 
+ #if defined(VM_DRIVER_PAGES)
+         vma->vm_flags |= VM_DRIVER_PAGES;
+-- 
+1.7.9.5
+
diff --git a/projects/ATV/options b/projects/ATV/options
index 2795b59ffa..5ece8da1fb 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -319,7 +319,7 @@
   UPDATE_SUPPORT="yes"
 
 # build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
+  INSTALLER_SUPPORT="no"
 
 # Testpackages for development (yes / no)
   TESTING="no"