diff --git a/packages/security/gnutls/build b/packages/security/gnutls/build
deleted file mode 100755
index c4547da970..0000000000
--- a/packages/security/gnutls/build
+++ /dev/null
@@ -1,53 +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
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-hardware-acceleration \
-            --disable-openssl-compatibility \
-            --without-p11-kit \
-            --with-included-libtasn1 \
-            --with-included-libcfg \
-            --with-libnettle-prefix="$SYSROOT_PREFIX/usr" \
-            --with-libz-prefix="$SYSROOT_PREFIX/usr" \
-            --disable-gtk-doc \
-            --disable-gtk-doc-html \
-            --disable-gtk-doc-pdf \
-            --disable-nls \
-            --disable-guile \
-            --disable-valgrind-tests \
-            --with-gnu-ld
-
-#           --enable-cryptodev \
-
-make -C gl
-make -C lib
-make -C extra
-
-$MAKEINSTALL -C lib
-$MAKEINSTALL -C extra
diff --git a/packages/security/gnutls/install b/packages/security/gnutls/install
deleted file mode 100755
index 5ead1b59ef..0000000000
--- a/packages/security/gnutls/install
+++ /dev/null
@@ -1,26 +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
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/libgnutls.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/libgnutlsxx.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libgnutlsxx.so*T
diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/package.mk
similarity index 71%
rename from packages/security/gnutls/meta
rename to packages/security/gnutls/package.mk
index ac121d4078..fcfd0d6d82 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/package.mk
@@ -24,11 +24,28 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gnutls.org/"
 PKG_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib nettle"
-PKG_BUILD_DEPENDS="toolchain zlib nettle"
+PKG_BUILD_DEPENDS_TARGET="toolchain zlib nettle"
 PKG_PRIORITY="optional"
 PKG_SECTION="security"
 PKG_SHORTDESC="gnutls: Development Library for TLS applications"
 PKG_LONGDESC="GnuTLS is a project that aims to develop a library which provides a secure layer, over a reliable transport layer. Currently the GnuTLS library implements the proposed standards by the IETF's TLS working group. Quoting from RFC2246 - the TLS 1.0 protocol specification: The TLS protocol provides communications privacy over the Internet. The protocol allows client/server applications to communicate in a way that is designed to prevent eavesdropping, tampering, or message forgery."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-hardware-acceleration \
+                           --disable-openssl-compatibility \
+                           --without-p11-kit \
+                           --with-included-libtasn1 \
+                           --with-libz-prefix=$SYSROOT_PREFIX/usr \
+                           --disable-gtk-doc \
+                           --disable-gtk-doc-html \
+                           --disable-gtk-doc-pdf \
+                           --disable-nls \
+                           --disable-guile \
+                           --disable-valgrind-tests \
+                           --with-gnu-ld"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+}