diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index f386dcc550..27e049a445 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="dc3bee7"
+PKG_VERSION="3669b6e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 72012336f0..97d22eab79 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -64,6 +64,12 @@ else
   XBMC_NFS="--disable-nfs"
 fi
 
+if [ "$AFP_SUPPORT" = yes ]; then
+  XBMC_AFP="--enable-afpclient"
+else
+  XBMC_AFP="--disable-afpclient"
+fi
+
 if [ "$WEBSERVER" = yes ]; then
   XBMC_WEBSERVER="--enable-webserver"
 else
@@ -170,6 +176,7 @@ cd $PKG_BUILD
             $XBMC_PULSEAUDIO \
             --enable-rtmp \
             $XBMC_NFS \
+            $XBMC_AFP \
             --enable-ffmpeg-libvorbis \
             --enable-lame \
             $XBMC_DVDCSS \
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 852748cf1f..4ef525c2e3 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="dc3bee7"
+PKG_VERSION="3669b6e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -67,6 +67,11 @@ if [ "$NFS_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS libnfs"
 fi
 
+if [ "$AFP_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
+  PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
+fi
+
 if [ "$WEBSERVER" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
   PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-3669b6e-301-rename_afpfs_includedir-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-301-rename_afpfs_includedir-0.1.patch
new file mode 100644
index 0000000000..9009c1697e
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-301-rename_afpfs_includedir-0.1.patch
@@ -0,0 +1,28 @@
+diff -Naur xbmc-f43dcfa/configure.in xbmc-f43dcfa.patch/configure.in
+--- xbmc-f43dcfa/configure.in	2011-09-10 02:31:22.000000000 +0200
++++ xbmc-f43dcfa.patch/configure.in	2011-09-10 08:16:46.068320869 +0200
+@@ -963,7 +963,7 @@
+ USE_LIBAFPCLIENT=0
+ if test "$host_vendor" = "apple" ; then
+   if test "x$use_libafpclient" != "xno"; then
+-    AC_CHECK_HEADERS([afp/libafpclient.h],,
++    AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
+      [if test "x$use_libafpclient" = "xyes"; then
+         AC_MSG_ERROR($libafpclient_not_found)
+       elif test "x$use_libafpclient" != "xno"; then
+diff -Naur xbmc-f43dcfa/xbmc/filesystem/DllLibAfp.h xbmc-f43dcfa.patch/xbmc/filesystem/DllLibAfp.h
+--- xbmc-f43dcfa/xbmc/filesystem/DllLibAfp.h	2011-09-10 02:31:05.000000000 +0200
++++ xbmc-f43dcfa.patch/xbmc/filesystem/DllLibAfp.h	2011-09-10 08:17:55.057220975 +0200
+@@ -27,9 +27,9 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif   
+-#include <afp/libafpclient.h>
+-#include <afp/map_def.h>
+-#include <afp/midlevel.h>
++#include <afpfs-ng/libafpclient.h>
++#include <afpfs-ng/map_def.h>
++#include <afpfs-ng/midlevel.h>
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/packages/mediacenter/xbmc/patches/xbmc-3669b6e-302-enable_afpfs_support_in_linux-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-302-enable_afpfs_support_in_linux-0.1.patch
new file mode 100644
index 0000000000..d2b6b4f0d7
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-302-enable_afpfs_support_in_linux-0.1.patch
@@ -0,0 +1,47 @@
+diff -Naur xbmc-f43dcfa/configure.in xbmc-f43dcfa.patch/configure.in
+--- xbmc-f43dcfa/configure.in	2011-09-10 08:23:01.971219535 +0200
++++ xbmc-f43dcfa.patch/configure.in	2011-09-10 08:24:33.480411313 +0200
+@@ -958,29 +958,24 @@
+   AC_MSG_NOTICE($libnfs_disabled)
+ fi
+ 
+-
+ # libafpclient
+-USE_LIBAFPCLIENT=0
+-if test "$host_vendor" = "apple" ; then
+-  if test "x$use_libafpclient" != "xno"; then
+-    AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
+-     [if test "x$use_libafpclient" = "xyes"; then
+-        AC_MSG_ERROR($libafpclient_not_found)
+-      elif test "x$use_libafpclient" != "xno"; then
+-        AC_MSG_NOTICE($libafpclient_not_found)
+-        use_libafpclient="no"
+-      fi
+-     ])
+-    if test "x$use_libafpclient" != "xno"; then
+-      XB_FIND_SONAME([AFPCLIENT], [afpclient], [use_libafpclient])
+-      AC_DEFINE([HAVE_LIBAFPCLIENT], [1], [Whether to use libafpclient library.])
+-      USE_LIBAFPCLIENT=1
++if test "x$use_libafpclient" != "xno"; then
++  AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
++   [if test "x$use_libafpclient" = "xyes"; then
++      AC_MSG_ERROR($libafpclient_not_found)
++    elif test "x$use_libafpclient" != "xno"; then
++      AC_MSG_NOTICE($libafpclient_not_found)
++      use_libafpclient="no"
+     fi
+-  else
+-    AC_MSG_NOTICE($libafpclient_disabled)
++   ])
++  if test "x$use_libafpclient" != "xno"; then
++    XB_FIND_SONAME([AFPCLIENT], [afpclient], [use_libafpclient])
++    AC_DEFINE([HAVE_LIBAFPCLIENT], [1], [Whether to use libafpclient library.])
++    USE_LIBAFPCLIENT=1
+   fi
+ else
+-  use_libafpclient="no"
++  USE_LIBAFPCLIENT=0
++  AC_MSG_NOTICE($libafpclient_disabled)
+ fi
+ 
+ ### External libraries checks
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-351-increase_YV12_buffers-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-351-increase_YV12_buffers-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-351-increase_YV12_buffers-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-453-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-453-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-453-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-3669b6e-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-dc3bee7-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-3669b6e-464-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch
deleted file mode 100644
index c6c5e2e5c6..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-dc3bee7-301-fix_so_name_detection-0.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-dc3bee7/configure.in xbmc-dc3bee7.patch/configure.in
---- xbmc-dc3bee7/configure.in	2011-09-09 01:27:11.000000000 +0200
-+++ xbmc-dc3bee7.patch/configure.in	2011-09-09 03:37:55.671676295 +0200
-@@ -20,7 +20,7 @@
- [
-   if [[ "$host_vendor" != "apple" ]]; then
-     AC_MSG_CHECKING([for lib$2 soname])
--    $1_FILENAME=$($LD $LDFLAGS -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-+    $1_FILENAME=$($LD -l$2 -M -o /dev/null 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-     if [[ ! -z $$1_FILENAME ]]; then
-       $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
-     fi