diff --git a/net-misc/openvpn-as/ChangeLog b/net-misc/openvpn-as/ChangeLog
index 93944e5a..e780555c 100644
--- a/net-misc/openvpn-as/ChangeLog
+++ b/net-misc/openvpn-as/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openvpn-as-2.0.17 (10 Jun 2015)
+
+  10 Jun 2015; Mario Fetka <mario.fetka@gmail.com> +openvpn-as-2.0.17.ebuild:
+  Bump
+
 *openvpn-as-2.0.12 (17 Feb 2015)
 
   17 Feb 2015; Mario Fetka <mario.fetka@gmail.com> +openvpn-as-2.0.12.ebuild,
diff --git a/net-misc/openvpn-as/Manifest b/net-misc/openvpn-as/Manifest
index 51227e53..6512efb4 100644
--- a/net-misc/openvpn-as/Manifest
+++ b/net-misc/openvpn-as/Manifest
@@ -3,6 +3,9 @@ AUX openvpnas.initd 1066 SHA256 7537bff5460a0cf5c269935b0a05ef80e94fc99267d041ff
 AUX openvpnas.pamd 4868 SHA256 20b1342ae5453f8aa8aa8736818b2b4c67329b1d73d0e357cc6ee8c9da34dcff SHA512 6b773c41a4de3677f9201e91984210875c3a8680828fd89cbfa745618ae20c252e6732cdc6d00b4d90f463bacee5161c31d3272a5d0ffc10379bca3472e0fa32 WHIRLPOOL 4373409cc1dd918c01db35e9e715b7dccd0d8a2e26e0a9a3d212ee0f2c4c222913390ba912a2828486c4d1f3e75d76cb789008f072d78a9431ca307750288f88
 DIST openvpn-as-2.0.12-Ubuntu12.amd_64.deb 26389570 SHA256 c12c502f011e6676fc771888ca5a4bb9ce94eda0ff7e59f7323a7a7f3e05793f SHA512 6c5b14b6095c082428d8c2297575039968daa9a9ca0d335a2c1d10197bb0ba27ce68de4d7dbdbacc8156a417c9e69d198643e251afd6649a9cf42a97a04f2ae5 WHIRLPOOL 818ba27fa2332a3cb8d501fbb540799745e6baae31fe35e10fabade53f08d5dd4e739a319b3391c397a29a7ad284d5bee4c89b7628111b7fe6317b9bd82df126
 DIST openvpn-as-2.0.12-Ubuntu12.i386.deb 26275718 SHA256 4d6ce87242a87fd3174b08be391f4aa3a17afebb605435fcf112ddd9367c2968 SHA512 3a045c8b1e7fcc06f9f6648995db55e24ddedf98ef66d85bb1e1b1e7ecad8702a18163e44b1ebe9754d2d337cd78d6ead68799548a2e1426f625239aaec0efa0 WHIRLPOOL 7ecb781aeb6f65f06fe3f0c2bb73d06a0fe571b18e1ccc4b0bb1f0604c0742738d83e69e84e1ea5fdf571be08e6ff2550dd9721ad85bf61594a0b45c720d8eb0
+DIST openvpn-as-2.0.17-Ubuntu12.amd_64.deb 26752714 SHA256 36cd0d36fd1751eb1ad97d52134e57184e741bcad6865bf78b34da9f2185a0e7 SHA512 9fa807b881cabb5bb53a54ac768098e20060524d8bb4f52b6c42356bcbf4392b8db6868a3ab10aab4a207233894104f13a4abe8d916571aafe04c0d71be373f0 WHIRLPOOL 4272d2e76f54fc7fa7d31558b500f2672b8cd2bdd5434c09705c5752b9fee5df81a33fd106bc3ed4e93b52fa854e32bc7860980b88173f155f10241bbf9ebc2a
+DIST openvpn-as-2.0.17-Ubuntu12.i386.deb 26434698 SHA256 2435439b130ea2dfce5a606e0b2d502aa7f380f0d4b6217cc4ebd372ac2bb1ed SHA512 c5d049ece964c32e2c5be9f566c15fedeee600a25f7ef9c0dcd786049ae58d4df3e7ec0cfa0df3dc7043b4228cd0f562791f7bd84bf62caf2b1b7c5792d688f1 WHIRLPOOL 585087a158ea5fc73d8cb5c424ba39e9fee2212d7a4d3d78ddf8c5e0a034f7475ba81f50480817027137140359a12ae204e21d40bf482a4fb29431e04d38d7ab
 EBUILD openvpn-as-2.0.12.ebuild 1425 SHA256 3e4aeffc5447b55e13ee9afabcf77bc1e9e430a4a823231bfae775e2d8785a7b SHA512 3c719921a4e8f3d1fb1cdd1b384ffc810121ef8b34e699b712f74b30aeeed5fbd5c06b9b43c0104c864b18d44a56f2a7f04e7334993679fbee7bcfcde5400dfa WHIRLPOOL 5151e592b4256de853e57c7836780f5b2b9c77775bbf4e9a4aab126499f940305082f77d8b6cf4aeb500d59cb7f2bc0a1199169f8e31ade202437127f6a9d6b4
-MISC ChangeLog 493 SHA256 3798b7800d7caa1466ae0589d3cbc359450cf4d096a55809b5e49631daa8c754 SHA512 b60594a1169ca0296745bba5d6430594b610621eec2a4fe443c27520b7cfe1fd60a937a47cbb789b16916190d900a09c34ad7a55166006b8709ef98d70328314 WHIRLPOOL 6724b889785c08fc4c2bf71033623eee7a308ab749563a35ed9068d7c28d8966c857784d890ac5f27cdb5ef149d895daa8f65adfbd68f0ef955e09ae2598c7ec
+EBUILD openvpn-as-2.0.17.ebuild 1425 SHA256 3e4aeffc5447b55e13ee9afabcf77bc1e9e430a4a823231bfae775e2d8785a7b SHA512 3c719921a4e8f3d1fb1cdd1b384ffc810121ef8b34e699b712f74b30aeeed5fbd5c06b9b43c0104c864b18d44a56f2a7f04e7334993679fbee7bcfcde5400dfa WHIRLPOOL 5151e592b4256de853e57c7836780f5b2b9c77775bbf4e9a4aab126499f940305082f77d8b6cf4aeb500d59cb7f2bc0a1199169f8e31ade202437127f6a9d6b4
+MISC ChangeLog 613 SHA256 e5d18037f402e5e32e94be1848aac76c0f83e170b7f08347386e0d6b9864b502 SHA512 0e9a3a26a5c078f62661fbb5c7a1b4f415c888d1291406a11c728637e6861de6f5bc0ccc1009b4afb1b8930cc0f91dcc4ecf13bb2ceb5af3a4ac4483107e8004 WHIRLPOOL 236dd88534881ce4b5ad56c94e660542bd6b37dd14ee5927c1660d4956e6a0163532b76357422d73e241b4769332c721acd68cd3bf4015012d4250999eaeccfc
 MISC metadata.xml 385 SHA256 7e8810b39419dd52164ecd03c1fd6eba589515b37f44bd5f188d43e54c169233 SHA512 3884ad738b358a749f2ec3c0909ae157a1c4d73454530588dcfd44930fd49a82b497df1c09ccad72497ba47ed2999756720c841a4b4065ddafaf5aeb48dc5783 WHIRLPOOL 376f0af8f295fae7f264d0f4218388d1e36d7aa2fdd0892a69f03f1ad71fe2a405af70dccfe1370e7392f325b9527b624fbefe23135622f33433e14fbcf488a6
diff --git a/net-misc/openvpn-as/openvpn-as-2.0.17.ebuild b/net-misc/openvpn-as/openvpn-as-2.0.17.ebuild
new file mode 100644
index 00000000..6bb10c4b
--- /dev/null
+++ b/net-misc/openvpn-as/openvpn-as-2.0.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils unpacker user pam
+
+DESCRIPTION="OpenVPN Access Server"
+HOMEPAGE="https://openvpn.net/index.php/access-server/overview.html"
+
+SRC_URI="amd64? ( http://swupdate.openvpn.org/as/openvpn-as-${PV}-Ubuntu12.amd_64.deb )
+	x86? ( http://swupdate.openvpn.org/as/openvpn-as-${PV}-Ubuntu12.i386.deb )"
+
+LICENSE=""
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+
+RESTRICT="strip mirror test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+#QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
+#        opt/${PN}/$(get_libdir)/libNeroAPI.so"
+#QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
+#QA_PREBUILT="opt/${PN}/${PN}.*
+#        opt/${PN}/${PN}
+#        opt/${PN}/$(get_libdir)/.*so
+#        opt/${PN}/$(get_libdir)/${PN}/*
+#        opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
+#        usr/share/${PN}/helpers/splash/nerosplash"
+
+S=${WORKDIR}
+
+pkg_setup() {
+        enewgroup openvpn_as
+        enewuser openvpn_as -1 -1 -1 openvpn_as
+}
+
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/gentoo-specific.patch"
+}
+
+src_install() {
+	dodir /usr/local/openvpn_as
+	cp -aR usr/local/openvpn_as/* "${D}/usr/local/openvpn_as"
+	dodir /usr/bin
+	dosym /usr/local/openvpn_as/bin/ovpn-init /usr/bin/ovpn-init
+	newinitd "${FILESDIR}/openvpnas.initd" "openvpnas"
+	newpamd "${FILESDIR}/openvpnas.pamd" "openvpnas"
+}
+