diff --git a/config/functions b/config/functions
index fba0f2defc..586379e478 100644
--- a/config/functions
+++ b/config/functions
@@ -317,6 +317,7 @@ show_config() {
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - SSH Guard support:\t\t\t $SSHGUARD_SUPPORT"
+  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
   config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
   config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
   config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
diff --git a/packages/network/connman/build b/packages/network/connman/build
index 223e7ec577..8cee354b56 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -30,6 +30,13 @@ else
   CONNMAN_PPP="--disable-pptp"
 fi
 
+if [ "$OPENVPN_SUPPORT" = yes ]; then
+  CONNMAN_OPENVPN="--enable-openvpn"
+  export OVPN="/usr/sbin/openvpn"
+else
+  CONNMAN_OPENVPN="--disable-openvpn"
+fi
+
 export WPASUPPLICANT="/usr/bin/wpa_supplicant"
 
 cd $PKG_BUILD
@@ -52,7 +59,7 @@ cd $PKG_BUILD
             --disable-wispr \
             --disable-ofono \
             --disable-openconnect \
-            --disable-openvpn \
+            $CONNMAN_OPENVPN \
             --disable-vpnc \
             --disable-l2tp \
             $CONNMAN_PPTP \
diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index 107f8bcba2..bfab7a6b5f 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -39,3 +39,9 @@ if [ "$PPTP_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS ppp pptp"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS ppp pptp"
 fi
+
+if [ "$OPENVPN_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS openvpn"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS openvpn"
+fi
+
diff --git a/packages/network/openvpn/build b/packages/network/openvpn/build
new file mode 100755
index 0000000000..f6c6452ca8
--- /dev/null
+++ b/packages/network/openvpn/build
@@ -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
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-server \
+            --enable-password-save
+
+make
diff --git a/packages/network/openvpn/install b/packages/network/openvpn/install
new file mode 100755
index 0000000000..d1f30eda76
--- /dev/null
+++ b/packages/network/openvpn/install
@@ -0,0 +1,26 @@
+#!/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/sbin
+  cp -P $PKG_BUILD/openvpn $INSTALL/usr/sbin
diff --git a/packages/network/openvpn/meta b/packages/network/openvpn/meta
new file mode 100644
index 0000000000..3f235c927e
--- /dev/null
+++ b/packages/network/openvpn/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="openvpn"
+PKG_VERSION="2.2.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://openvpn.net"
+PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="openssl"
+PKG_BUILD_DEPENDS="toolchain lzo openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="openvpn: a full featured SSL VPN software solution that integrates OpenVPN server capabilities."
+PKG_LONGDESC="OpenVPN Access Server is a full featured SSL VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, and Linux OS environments. OpenVPN Access Server supports a wide range of configurations, including secure and granular remote access to internal network and/ or private cloud network resources and applications with fine-grained access control."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
diff --git a/projects/ATV/options b/projects/ATV/options
index 45c9d4b760..c6c6fd65aa 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -199,6 +199,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 213730bea9..8e9fd49de4 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Generic/options b/projects/Generic/options
index 0c04526481..c9949e8ac1 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index dfc6aab0a3..3961fb69cf 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/ION/options b/projects/ION/options
index 956f7611f8..684fb1a85a 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Intel/options b/projects/Intel/options
index 5746f58358..9b10287fa6 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/RPi/options b/projects/RPi/options
index 07cecf8832..3feaca1706 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 479bdf1ad0..68a5ec7e38 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -198,6 +198,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Virtual/options b/projects/Virtual/options
index e48c866123..15a9b30711 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -193,6 +193,9 @@
 # build and install PPP support (yes / no)
   PPTP_SUPPORT="yes"
 
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)