diff --git a/config/release/create_installstick.bat b/config/release/create_installstick.bat
index 4198fbe4f3..d5589d269b 100644
--- a/config/release/create_installstick.bat
+++ b/config/release/create_installstick.bat
@@ -91,7 +91,7 @@ echo PROMPT 0 >> %DRIVE%\syslinux.cfg
 echo. >> %DRIVE%\syslinux.cfg
 echo LABEL linux >> %DRIVE%\syslinux.cfg
 echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
-echo APPEND boot=UUID=%DRIVEUUID% installer quiet >> %DRIVE%\syslinux.cfg
+echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
 GOTO END
 
 :BADMD5
diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index 3a434413f6..375c283f76 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -4,6 +4,7 @@
     <setting id="NET_DNS2" value="" />
     <setting id="NET_DNS3" value="" />
     <setting id="NET_GATEWAY" value="" />
+    <setting id="NET_HIDDEN" value="false" />
     <setting id="NET_HOSTNAME" value="openelec" />
     <setting id="NET_IFACE" value="eth0" />
     <setting id="NET_IPADDRESS" value="" />
diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
index c37017605e..76453efdaf 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="os.openelec.settings"
        name="OpenELEC OS Settings"
-       version="0.0.2"
+       version="0.0.3"
        provider-name="openelec.tv">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py
index cca3ad5bc8..547ddba574 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/default.py
+++ b/packages/mediacenter/xbmc-addon-settings/source/default.py
@@ -27,7 +27,7 @@ __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
 __svn_url__ = ""
 __credits__ = ""
-__version__ = "0.0.2"
+__version__ = "0.0.3"
 __XBMC_Revision__ = "22240"
 
 __settings__   = xbmcaddon.Addon(id='os.openelec.settings')
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index 997d2bc294..cf51531315 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -15,15 +15,16 @@
 	<string id="2122">Netwerk apparaat of MAC adres</string>
 	<string id="2130">IP instelling</string>
 	<string id="2131">Statisch IP adres</string>
-	<string id="2132">Netmask Prefixlength</string>
+	<string id="2132">Netwerkprefix lengte</string>
 	<string id="2133">Netwerk gateway</string>
-	<string id="2134">DNS servers 1</string>
-	<string id="2135">DNS servers 2</string>
-	<string id="2136">DNS servers 3</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 Instellingen</string>
 	<string id="2151">WLAN SSID (router naam)</string>
-	<string id="2152">WLAN beveiliging</string>
-	<string id="2153">WLAN wachtwoord</string>
+	<string id="2152">Verborgen netwerk</string>
+	<string id="2153">WLAN beveiliging</string>
+	<string id="2154">WLAN wachtwoord</string>
 
 	<!-- LCD -->
 	<string id="3100">LCD/VFD</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index 25f8faf1bc..5137a33f67 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -22,8 +22,9 @@
 	<string id="2136">DNS server 3</string>
 	<string id="2150">WLAN settings</string>
 	<string id="2151">WLAN SSID</string>
-	<string id="2152">WLAN Security</string>
-	<string id="2153">WLAN Passphrase</string>
+	<string id="2152">Hidden Network</string>
+	<string id="2153">WLAN Security</string>
+	<string id="2154">WLAN Passphrase</string>
 
 	<!-- LCD -->
 	<string id="3100">LCD/VFD</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index 016923872c..d65cba4a11 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -22,8 +22,9 @@
 	<string id="2136">Serveurs DNS 3</string>
 	<string id="2150">Paramètres WIFI</string>
 	<string id="2151">SSID</string>
-	<string id="2152">Sécurité WIFI</string>
-	<string id="2153">Passphrase</string>
+	<string id="2152">Réseau masqué</string>
+	<string id="2153">Sécurité WIFI</string>
+	<string id="2154">Passphrase</string>
 
 	<!-- LCD -->
 	<string id="3100">LCD/VFD</string>
@@ -33,7 +34,7 @@
 	<!-- TV_SERVER -->
 	<string id="4100">TV/PVR</string>
 	<string id="4110">Démarrage</string>
-	<string id="4111">Lancer le serveur TV Server au démarrage</string>
+	<string id="4111">Lancer le serveur TV au démarrage</string>
 
 	<!-- SAMBA -->
 	<string id="5000">Samba</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index f20988c06c..e53b26a52f 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -28,8 +28,9 @@
 		<setting label="2150" type="lsep"/>
 		<setting type="sep" />
 		<setting id="NET_SSID" type="text" label="2151" default=""/>
-		<setting id="NET_SECURITY" type="labelenum" label="2152" values="NONE|PSK|WEP" sort="yes" default="NONE" />
-		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2153" default=""  enable="!eq(-1,0)"/>
+		<setting id="NET_HIDDEN" type="bool" label="2152" default="false" />
+		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|PSK|WEP" sort="yes" default="NONE" />
+		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
     </category>
 
    <!-- LCD -->
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 4cc1aa96f6..a9b15c5050 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -34,6 +34,7 @@ if [ -f "$OPENELEC_SETTINGS" ]; then
   DNS1=`grep NET_DNS1 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
   DNS2=`grep NET_DNS2 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
   DNS3=`grep NET_DNS3 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  HIDDEN=`grep NET_HIDDEN $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
   SSID=`grep NET_SSID $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
   SECURITY=`grep NET_SECURITY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
   PASSPHRASE=`grep NET_PASSPHRASE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
@@ -79,7 +80,12 @@ fi
           MODE="managed_none"
         fi
 
-        echo "[wifi_${IFACE}_${SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
+        if [ "$HIDDEN" = "true" ]; then
+          echo "[wifi_${IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
+        else
+          echo "[wifi_${IFACE}_${SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
+        fi
+
         echo "Name=$SSID"  >> $CONNMAN_PROFILE
         echo "SSID=$SSID_HEX"  >> $CONNMAN_PROFILE
         [ -n "$PASSPHRASE" ] && echo "Passphrase=$PASSPHRASE" >> $CONNMAN_PROFILE
diff --git a/packages/network/netmount/init.d/59_netmount b/packages/network/netmount/init.d/59_netmount
index 483e4d90fd..f35f58c0d0 100644
--- a/packages/network/netmount/init.d/59_netmount
+++ b/packages/network/netmount/init.d/59_netmount
@@ -22,29 +22,7 @@
 #
 # runlevels: openelec, textmode
 
-NETMOUNT_USERCONF="/storage/.config/netmount.conf"
-
-if [ -f $NETMOUNT_USERCONF ]; then
-
 wait_for_network
 
-IFS="
-"
-  for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
-    SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-    SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-    MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-    OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
-
-    progress "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
-      mkdir -p $MOUNTPOINT
-      case "$SERVICE" in
-        cifs|smb|samba)
-          mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
-          ;;
-        nfs)
-          mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
-          ;;
-      esac
-  done
-fi
+progress "mounting Network shares"
+  netmount
diff --git a/packages/network/netmount/install b/packages/network/netmount/install
index 70d9667db0..87546cd92a 100755
--- a/packages/network/netmount/install
+++ b/packages/network/netmount/install
@@ -22,5 +22,8 @@
 
 . config/options $1
 
+  mkdir -p $INSTALL/usr/bin
+    cp $PKG_DIR/scripts/netmount $INSTALL/usr/bin
+
   mkdir -p $INSTALL/usr/config
     cp $PKG_DIR/config/netmount.conf.sample $INSTALL/usr/config
diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount
new file mode 100755
index 0000000000..38730eca3b
--- /dev/null
+++ b/packages/network/netmount/scripts/netmount
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+################################################################################
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.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
+################################################################################
+
+# Mounting Network shares
+
+NETMOUNT_USERCONF="/storage/.config/netmount.conf"
+
+if [ -f "$NETMOUNT_USERCONF" ]; then
+
+IFS="
+"
+  for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
+    SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+    OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
+
+    logger -t Netmount "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
+
+    mkdir -p $MOUNTPOINT
+    case "$SERVICE" in
+      cifs)
+        mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
+        ;;
+      nfs)
+        mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
+        ;;
+    esac
+  done
+fi
+
+exit 0
diff --git a/packages/sysutils/v4l-utils/meta b/packages/sysutils/v4l-utils/meta
index 272dad27ba..0e05a0c85e 100644
--- a/packages/sysutils/v4l-utils/meta
+++ b/packages/sysutils/v4l-utils/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="v4l-utils"
-PKG_VERSION="20110107"
+PKG_VERSION="0.8.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://linuxtv.org/downloads/v4l-utils//$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/tools/hdparm/meta b/packages/tools/hdparm/meta
index 2dbe9f6292..8a33bac034 100644
--- a/packages/tools/hdparm/meta
+++ b/packages/tools/hdparm/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="hdparm"
-PKG_VERSION="9.36"
+PKG_VERSION="9.37"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
diff --git a/packages/tools/meta b/packages/tools/meta
index d17d859117..7a00cb0232 100644
--- a/packages/tools/meta
+++ b/packages/tools/meta
@@ -34,6 +34,3 @@ PKG_LONGDESC="debug is a Metapackage for installing some tools"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
-
-
-
diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/meta
index bb0ef388aa..20bf5c8194 100644
--- a/packages/x11/lib/libXi/meta
+++ b/packages/x11/lib/libXi/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libXi"
-PKG_VERSION="1.4.0"
+PKG_VERSION="1.4.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"