diff --git a/packages/network/afpfs-ng/build b/packages/network/afpfs-ng/build
deleted file mode 100755
index fcf9d96b16..0000000000
--- a/packages/network/afpfs-ng/build
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. 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 \
-            --disable-fuse \
-
-make -C lib
-
-$MAKEINSTALL -C lib
-$MAKEINSTALL -C include
diff --git a/packages/network/afpfs-ng/install b/packages/network/afpfs-ng/install
deleted file mode 100755
index bc9b4b1985..0000000000
--- a/packages/network/afpfs-ng/install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/network/afpfs-ng/meta b/packages/network/afpfs-ng/package.mk
similarity index 78%
rename from packages/network/afpfs-ng/meta
rename to packages/network/afpfs-ng/package.mk
index a531d8369f..effc150e6a 100644
--- a/packages/network/afpfs-ng/meta
+++ b/packages/network/afpfs-ng/package.mk
@@ -23,12 +23,24 @@ 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="libgpg-error libgcrypt ncurses"
-PKG_BUILD_DEPENDS="toolchain libgpg-error libgcrypt ncurses"
+PKG_DEPENDS_TARGET="libgpg-error libgcrypt ncurses"
+PKG_BUILD_DEPENDS_TARGET="toolchain libgpg-error libgcrypt 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_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
+                           --enable-gcrypt \
+                           --disable-fuse"
+
+PKG_MAKE_OPTS_TARGET="-C lib"
+
+makeinstall_target() {
+  $MAKEINSTALL -C lib
+  $MAKEINSTALL -C include
+  make -C lib DESTDIR=$INSTALL install
+}