diff --git a/packages/network/openvpn/build b/packages/network/openvpn/build
deleted file mode 100755
index e68831eb60..0000000000
--- a/packages/network/openvpn/build
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-ac_cv_have_decl_TUNSETPERSIST=no \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-server \
-            --enable-password-save \
-            --disable-plugins \
-            --enable-iproute2 IPROUTE="/sbin/ip" \
-            --disable-management \
-            --disable-socks \
-            --disable-http-proxy \
-            --disable-fragment \
-            --disable-multihome \
-            --disable-port-share \
-            --disable-debug \
-
-
-make
diff --git a/packages/network/openvpn/install b/packages/network/openvpn/install
deleted file mode 100755
index 08d4e8266d..0000000000
--- a/packages/network/openvpn/install
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/sbin
-  cp -P $PKG_BUILD/src/openvpn/openvpn $INSTALL/usr/sbin
diff --git a/packages/network/openvpn/meta b/packages/network/openvpn/package.mk
similarity index 73%
rename from packages/network/openvpn/meta
rename to packages/network/openvpn/package.mk
index c3da3a531b..725fa33b08 100644
--- a/packages/network/openvpn/meta
+++ b/packages/network/openvpn/package.mk
@@ -24,8 +24,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://openvpn.net"
 PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="openssl"
-PKG_BUILD_DEPENDS="toolchain lzo openssl"
+PKG_DEPENDS_TARGET="openssl"
+PKG_BUILD_DEPENDS_TARGET="toolchain lzo openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="openvpn: a full featured SSL VPN software solution that integrates OpenVPN server capabilities."
@@ -33,3 +33,16 @@ PKG_LONGDESC="OpenVPN Access Server is a full featured SSL VPN software solution
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \
+                           --disable-server \
+                           --enable-password-save \
+                           --disable-plugins \
+                           --enable-iproute2 IPROUTE=/sbin/ip \
+                           --disable-management \
+                           --disable-socks \
+                           --disable-http-proxy \
+                           --disable-fragment \
+                           --disable-multihome \
+                           --disable-port-share \
+                           --disable-debug"