diff --git a/packages/3rdparty/x11/lib/libXcursor/meta b/packages/3rdparty/x11/lib/libXcursor/meta
index fab6331a2e..121d2ce199 100644
--- a/packages/3rdparty/x11/lib/libXcursor/meta
+++ b/packages/3rdparty/x11/lib/libXcursor/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXfixes libXrender libX11"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="toolchain libX11 libXfixes libXrender"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libXcursor: X Cursor Library"
diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta
index 69acd8c7a7..2c0c214f60 100644
--- a/packages/mediacenter/service.openelec.settings/meta
+++ b/packages/mediacenter/service.openelec.settings/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.1.24"
+PKG_VERSION="0.1.25"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."
diff --git a/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbdeinit-and-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
similarity index 90%
rename from packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbdeinit-and-wait-for-nic-on-wakeup.patch
rename to packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
index 51c30b698d..fe17220717 100644
--- a/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbdeinit-and-wait-for-nic-on-wakeup.patch
+++ b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
@@ -1,7 +1,7 @@
 diff -rupN xbmc-upstream/xbmc/Application.cpp xbmc-vbs/xbmc/Application.cpp
 --- xbmc-upstream/xbmc/Application.cpp	2013-06-12 00:24:40.486262597 +0200
 +++ xbmc-vbs/xbmc/Application.cpp	2013-06-12 01:23:11.948400122 +0200
-@@ -5907,3 +5907,33 @@ CPerformanceStats &CApplication::GetPerf
+@@ -5907,3 +5907,37 @@ CPerformanceStats &CApplication::GetPerf
  }
  #endif
  
@@ -12,6 +12,10 @@ diff -rupN xbmc-upstream/xbmc/Application.cpp xbmc-vbs/xbmc/Application.cpp
 +#if defined(HAS_FILESYSTEM_SMB) && !defined(_WIN32)
 +  smb.Deinit();
 +#endif
++
++#if defined(HAS_FILESYSTEM_NFS)
++  gNfsConnection.Deinit();
++#endif
 +}
 +
 +void CApplication::StopAddonServices()
@@ -59,6 +63,18 @@ diff -rupN xbmc-upstream/xbmc/filesystem/SmbFile.cpp xbmc-vbs/xbmc/filesystem/Sm
    if (!m_context)
    {
  #ifdef TARGET_POSIX
+diff -rupN xbmc-upstream/xbmc/filesystem/NFSFile.cpp xbmc-vbs/xbmc/filesystem/NFSFile.cpp
+--- xbmc-upstream/xbmc/filesystem/NFSFile.cpp	2013-07-12 22:18:51.062605410 +0200
++++ xbmc-vbs/xbmc/filesystem/NFSFile.cpp	2013-07-12 22:19:27.069861082 +0200
+@@ -308,6 +308,8 @@
+
+ void CNfsConnection::Deinit()
+ {
++  CLog::Log(LOGNOTICE,"CNfsConnection::Deinit");
++
+   if(m_pNfsContext && m_pLibNfs->IsLoaded())
+   {
+     destroyOpenContexts();
 diff -rupN xbmc-upstream/xbmc/powermanagement/PowerManager.cpp xbmc-vbs/xbmc/powermanagement/PowerManager.cpp
 --- xbmc-upstream/xbmc/powermanagement/PowerManager.cpp	2013-06-12 00:24:41.634276292 +0200
 +++ xbmc-vbs/xbmc/powermanagement/PowerManager.cpp	2013-06-12 01:15:32.166859998 +0200
diff --git a/packages/unofficial b/packages/unofficial
index d251ddd5d6..464a7aa0fc 160000
--- a/packages/unofficial
+++ b/packages/unofficial
@@ -1 +1 @@
-Subproject commit d251ddd5d62edbf8dc5e7313b1e762fdb4cc73b7
+Subproject commit 464a7aa0fc2b6c12042c2f302029d0bba1807f8f