diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 63440357cd..990e5feaf2 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="8cb8ae1"
+PKG_VERSION="4511eb1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 7bf3a47151..dc7a73eef1 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="8cb8ae1"
+PKG_VERSION="4511eb1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.3.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.3.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch
new file mode 100644
index 0000000000..60805921bf
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch
@@ -0,0 +1,92 @@
+diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in
+--- xbmc-8cb8ae1/configure.in	2011-09-16 16:29:14.811482548 +0200
++++ xbmc-8cb8ae1.patch/configure.in	2011-09-16 16:36:21.700065520 +0200
+@@ -944,12 +944,15 @@
+ if test "x$use_samba" != "xno"; then
+   AC_CHECK_LIB([smbclient], [main],,
+     use_samba=no;AC_MSG_ERROR($missing_library))
++    USE_LIBSMBCLIENT=0
+ else
+   AC_MSG_RESULT($samba_disabled)
++  USE_LIBSMBCLIENT=0
+ fi
+ 
+ if test "x$use_samba" != "xno"; then
+   AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
++  USE_LIBSMBCLIENT=1
+ fi
+ 
+ # libnfs
+@@ -1707,6 +1710,7 @@
+ AC_SUBST(USE_VDPAU)
+ AC_SUBST(USE_VAAPI)
+ AC_SUBST(USE_CRYSTALHD)
++AC_SUBST(USE_LIBSMBCLIENT)
+ AC_SUBST(USE_LIBNFS)
+ AC_SUBST(USE_LIBAFPCLIENT)
+ AC_SUBST(USE_VDA)
+diff -Naur xbmc-8cb8ae1/xbmc/filesystem/FileSmb.cpp xbmc-8cb8ae1.patch/xbmc/filesystem/FileSmb.cpp
+--- xbmc-8cb8ae1/xbmc/filesystem/FileSmb.cpp	2011-09-13 05:37:52.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/filesystem/FileSmb.cpp	2011-09-16 16:42:38.552999670 +0200
+@@ -24,8 +24,6 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include "system.h"
+-
+-#if defined(HAS_FILESYSTEM_SMB)
+ #include "FileSmb.h"
+ #include "PasswordManager.h"
+ #include "SMBDirectory.h"
+@@ -777,4 +775,3 @@
+   CPasswordManager::GetInstance().AuthenticateURL(authURL);
+   return smb.URLEncode(authURL);
+ }
+-#endif
+diff -Naur xbmc-8cb8ae1/xbmc/filesystem/Makefile.in xbmc-8cb8ae1.patch/xbmc/filesystem/Makefile.in
+--- xbmc-8cb8ae1/xbmc/filesystem/Makefile.in	2011-09-13 05:37:52.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/filesystem/Makefile.in	2011-09-16 16:41:58.828479325 +0200
+@@ -31,7 +31,6 @@
+      FileRTV.cpp \
+      FileShoutcast.cpp \
+      FileSFTP.cpp \
+-     FileSmb.cpp \
+      FileSpecialProtocol.cpp \
+      FileTuxBox.cpp \
+      FileUDF.cpp \
+@@ -70,7 +69,6 @@
+      SIDFileDirectory.cpp \
+      Slingbox.cpp \
+      SmartPlaylistDirectory.cpp \
+-     SMBDirectory.cpp \
+      SourcesDirectory.cpp \
+      SpecialProtocol.cpp \
+      SpecialProtocolDirectory.cpp \
+@@ -93,6 +91,11 @@
+ SRCS+=RarManager.cpp
+ endif
+ 
++ifeq (@USE_LIBSMBCLIENT@,1)
++SRCS+=FileSmb.cpp
++SRCS+=SMBDirectory.cpp
++endif
++
+ ifeq (@USE_LIBNFS@,1)
+ SRCS+=FileNFS.cpp
+ SRCS+=NFSDirectory.cpp
+diff -Naur xbmc-8cb8ae1/xbmc/filesystem/SMBDirectory.cpp xbmc-8cb8ae1.patch/xbmc/filesystem/SMBDirectory.cpp
+--- xbmc-8cb8ae1/xbmc/filesystem/SMBDirectory.cpp	2011-09-13 05:37:52.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/filesystem/SMBDirectory.cpp	2011-09-16 16:43:27.957646887 +0200
+@@ -33,7 +33,6 @@
+ 
+ #include "system.h"
+ 
+-#if defined(HAS_FILESYSTEM_SMB)
+ #include "SMBDirectory.h"
+ #include "Util.h"
+ #include "guilib/LocalizeStrings.h"
+@@ -501,5 +500,3 @@
+   return XBMC_SMB_MOUNT_PATH + strPath;
+ #endif
+ }
+-
+-#endif
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-302-enable_afpfs_support_in_linux-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-302-enable_afpfs_support_in_linux-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-302-enable_afpfs_support_in_linux-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-302-enable_afpfs_support_in_linux-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-351-increase_YV12_buffers-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-351-increase_YV12_buffers-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-351-increase_YV12_buffers-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-453-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-4511eb1-464-add_eject_keymapping_for_lirc-0.1.patch