diff --git a/packages/network/afpfs-ng/build b/packages/network/afpfs-ng/build
new file mode 100755
index 0000000000..030b26b57b
--- /dev/null
+++ b/packages/network/afpfs-ng/build
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@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
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --enable-gcrypt \
+            --enable-fuse \
+
+make -C lib
+make -C fuse
diff --git a/packages/network/afpfs-ng/install b/packages/network/afpfs-ng/install
new file mode 100755
index 0000000000..55d15a74d9
--- /dev/null
+++ b/packages/network/afpfs-ng/install
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@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
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/lib
+  cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/fuse/afpfs $INSTALL/usr/bin
+  cp $PKG_BUILD/fuse/.libs/afpfsd $INSTALL/usr/bin
+  cp $PKG_BUILD/fuse/.libs/mount_afp $INSTALL/usr/bin
+  ln -sf mount_afp $INSTALL/usr/bin/afp_client
diff --git a/packages/network/afpfs-ng/meta b/packages/network/afpfs-ng/meta
new file mode 100644
index 0000000000..d6c60127fb
--- /dev/null
+++ b/packages/network/afpfs-ng/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@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
+################################################################################
+
+PKG_NAME="afpfs-ng"
+PKG_VERSION="0.8.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://sourceforge.net/projects/afpfs-ng/"
+PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libiconv libgpg-error libgcrypt fuse ncurses"
+PKG_BUILD_DEPENDS="toolchain libiconv libgpg-error libgcrypt fuse ncurses"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="afpfs-ng: an Apple Filing Protocol client"
+PKG_LONGDESC="afpfs-ng is an Apple Filing Protocol client that will allow BSD, Linux and Mac OS X systems to access files exported from a Mac OS system with AFP over TCP."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/network/netmount/meta b/packages/network/netmount/meta
index b03d47fae3..086a9fac96 100644
--- a/packages/network/netmount/meta
+++ b/packages/network/netmount/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="cifs-utils nfs-utils sshfs-fuse connman"
+PKG_DEPENDS="afpfs-ng cifs-utils nfs-utils sshfs-fuse connman"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
diff --git a/packages/toolchain/devel/cmake/meta b/packages/toolchain/devel/cmake/meta
index d3f7535bc7..0a3619ae14 100644
--- a/packages/toolchain/devel/cmake/meta
+++ b/packages/toolchain/devel/cmake/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="2.8.3"
+PKG_VERSION="2.8.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"