diff --git a/dev-java/apache-archiva/Manifest b/dev-java/apache-archiva/Manifest
index 2001d88..1a01db0 100644
--- a/dev-java/apache-archiva/Manifest
+++ b/dev-java/apache-archiva/Manifest
@@ -1,4 +1,6 @@
 AUX apache-archiva.conf.d 159 SHA256 2f93d2d9732b71b0249032ab38a5d22185e763ff929f5929ad1f388b599c3677 SHA512 7cb55ba630c1ff9eb13085fa5344b87ee0b028f5524f6ab2474cc41d31b721bdf60add45f6bb5efb33968ccd4f66e4bb4e46da4908ca7396567409020aba95e0 WHIRLPOOL c60399d3c5f3ae5e611fdd9f7bc678067b6aab8a15f5adbee2b77f70552777698e925c72535051db2a22b154881fc53ee9af9aa84465f34c58466e0fdb94c29d
-AUX apache-archiva.init.d 686 SHA256 7394177e487c0853da110f1c07050395f564657ae20dbe1b5c3a257a0e1e8591 SHA512 3c05be929e6280464a1af93809ca0de5b5262a99537891afd7dab12a438f4754d5f142bef82fcde6322fd9f6d1383e6bc4c01baed4bd72f55103b97ebe88aa43 WHIRLPOOL e25ae1795c598527dab083737122b3d50a6a06c796903c77556b199d0ce17f7133aedaba42f1b7228c2e4356d4c9264f43d615e3b5065e787ef279a294f0ee38
+AUX apache-archiva.init.d 687 SHA256 8c104904591131451f1e966ac530ffb53ebe2ad143760ce0325fc5f203d9e853 SHA512 75ddebeb63d9ff1993a67189434035a43237e3d48c1ac88b51a6e291cc2e1a2df16cd85a72cc9850063402f0b51d477e6c152db2bb2e2f2734e87da7dfeb1711 WHIRLPOOL 0edf71d89a61c63727bc7bf52d641450fb49392ef9ad946fd68fa7bde9aa0eecef3165b47c04b61266a759bcb53dd7e5d27969e1d296ab750caa8c053f39a48e
 DIST apache-archiva-2.2.0-bin.tar.gz 65474332 SHA256 6af7c3c47c35584f729a9c139675a01f9a9819d0cdde292552fc783284a34cfa SHA512 cba8f26f7ac69d566b781c17ba732889c0ee8e9b59e4f87b5608577577a60a1bf91c64eb5bd9aafc8a0b8ac331ec9375af9f93906b81a6690bebcc0009347253 WHIRLPOOL eefd245341906f7a98afc1df1a7d9ba356e926b8857112730f71a8efddd9e95dc1537fb4cf666f7f32e8a09d4aebe07d5cf7a570a50935d748ac6902ce39b1ab
+DIST apache-archiva-2.2.1-bin.tar.gz 69504663 SHA256 e56653e219b76c8c3afdfc424a05e46664958c126ba1d29246e4fd4734c87ba3 SHA512 a1d0960876b97e760357a3eb39da81ad9ed08ec02946ad28babcc86f27703615e4de16a883e162ada8c63abc6723fa219410e194dfa49975d7bf281c0aa42f10 WHIRLPOOL da87832aa58e43c88cadb4595b274770a84755787140e3fb1be71a4f408be211e3d4398feead4ef00c5bb5debf188422b32a6701deed13c0986fc0943e77b93c
 EBUILD apache-archiva-2.2.0.ebuild 1707 SHA256 010d93e77244cdcd4c73b68830eb1087c1eb7e8ade26e7917ac9240a778fec44 SHA512 c49fd36bb56ad33a1f51afeb02276f3376b4bc1c0f48349c5348c8597d08cc1120a7824679b10b349506866efacbbca45c4c2de0a47062edd7f82b029661db8c WHIRLPOOL 484de32e2b4f88be3ab7ce604f6a3324b0657f6d3988235ef9a57bbf88e1406a0ab562d81b65a68e05a4de05021dc90bc7e71e4c62d4e76dd0ab9f6a6dc03e18
+EBUILD apache-archiva-2.2.1.ebuild 1707 SHA256 1dce665bf142389e4b0bc363a58bba82172d872bdbea0508aa17cc98a207e297 SHA512 a49bcd83fe6ef4a805ed4ad006077a6a3d217e30c143b70a5ece6a757f5510c2421eb19399071b9a700f2a51c58ed8c45794f5dea81ea471dd66df8c71e8e636 WHIRLPOOL d2d64d5252e11ce617fe10972a33ba7bd454da54cdd8e142f3616c7e4ea65f5156d74ba118b1ac123a4c803c26d5e2551f5b7d76ce7bed23d37705301202416d
diff --git a/dev-java/apache-archiva/apache-archiva-2.2.1.ebuild b/dev-java/apache-archiva/apache-archiva-2.2.1.ebuild
new file mode 100644
index 0000000..5c02e6c
--- /dev/null
+++ b/dev-java/apache-archiva/apache-archiva-2.2.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 user
+
+DESCRIPTION="The Build Artifact Repository Manager"
+ARCHBASEPAGE="http://archiva.apache.org/"
+SRC_URI="mirror://apache/archiva/${PV}/binaries/${P}-bin.tar.gz"
+
+LICENSE="apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="mysql"
+
+COMMON_DEP="mysql? ( dev-java/jdbc-mysql )
+	"
+
+RDEPEND=">=virtual/jre-1.7
+  ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.7
+  app-arch/unzip
+  ${COMMON_DEP}"
+
+EANT_BUILD_TARGET=""
+EANT_DOC_TARGET=""
+ARCHBASE="/var/lib/${PN}"
+
+pkg_setup() {
+  enewgroup archiva
+  enewuser archiva -1 /bin/sh ${ARCHBASE} archiva
+}
+
+src_prepare() {
+  rm lib/{*.dll,*-solaris-*,*-macosx-*}
+  rm bin/{*.bat,*-windows-*,*-solaris-*,*-macosx-*}
+  rm lib/libwrapper-linux-x86-32.so
+
+  sed -i \
+     -e "s!set.default.ARCHIVA_BASE=.*!set.default.ARCHIVA_BASE=${ARCHBASE}!g" \
+     -e "s!wrapper\.working\.dir=.*!wrapper.working.dir=/opt/${P}!g" \
+	 conf/wrapper.conf
+  
+  sed -i -e "s!uname -p!uname -m!g" bin/archiva
+}
+
+src_install() {
+  diropts -m0775 -o archiva -g archiva 
+  keepdir ${ARCHBASE}/{data,temp}
+  keepdir /var/log/${PN}
+
+  insinto /etc/${PN}
+  doins conf/*
+  chown archiva:archiva conf/archiva.xml
+
+  dosym /etc/${PN} ${ARCHBASE}/conf
+  dosym /var/log/${PN}  ${ARCHBASE}/logs
+
+  insinto /opt/${P}
+  doins -r apps contexts lib 
+  doins LICENSE NOTICE
+
+  exeinto /opt/${P}/bin
+  doexe bin/{wrapper-linux-x86-64,archiva}
+  
+  sed -e "s!##ARCHIVA##!${P}!g" \
+      -e "s!##ARCHBASE##!${ARCHBASE}!g" \
+    ${FILESDIR}/apache-archiva.conf.d > apache-archiva.conf.d
+
+  newinitd ${FILESDIR}/apache-archiva.init.d ${PN}
+  newconfd apache-archiva.conf.d ${PN} 
+}
diff --git a/dev-java/apache-archiva/files/apache-archiva.init.d b/dev-java/apache-archiva/files/apache-archiva.init.d
index abc1fdf..fc02ec3 100755
--- a/dev-java/apache-archiva/files/apache-archiva.init.d
+++ b/dev-java/apache-archiva/files/apache-archiva.init.d
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $