diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest
index 35eb08a..597b6cc 100644
--- a/dev-java/nexus-oss-bin/Manifest
+++ b/dev-java/nexus-oss-bin/Manifest
@@ -1,3 +1,4 @@
-AUX init.sh 419 SHA256 11617fd995b9d17dbaee7421b315a5bddc5861a8e9a8e522e5d4445f2357ec1e SHA512 2ce7a5b3f396865551f0d35efa7a10ff4b4e396095066043b028316e859c7b3fca6c4035d224ad9260a5db1e3e1bf92416ea6c13b67ff8cc18ebdb0b91265300 WHIRLPOOL 1cc82a03d026bb959aefc2ee2b6ea0b80102e15654398d4609f63d3ce4b8ebc6310740628707aaddadb4f062f767ddd6c8caef937f87630b85096d1207df987b
+AUX init.sh 381 SHA256 7adb00b5de411223dcdaf017005e7103d8716e885a008f19aa8d56db2afa47de SHA512 b458fda89207b327f34c3e14f0c51ab86e7aa271867ec9a6c72634e1b8d81aebafba8ac6279f359fc9ba520920bee64fb439588b3f771d647ee8f3fde0ea742d WHIRLPOOL ac4d4fc6facc926f697706beb7b95d9c3bceb35a2e2d04eb656a73b2ed397c4dac521b3566307189655d6afcaa1ea116fbb8ff645a32cad484bf3ed0380b2dc8
+AUX nexus-wrapper.patch 1193 SHA256 0ae0408df651d2bbf55a00f871e6640caa7161adf0936bfe32fa24e9b1658fff SHA512 2e54a97b288db451953d2bef2fe7bef1c1aad5f344acaad2e84d4e1c466dd7d169c84a9be7eefdbf974d20b903b598290bc6a189dcc199c6ebc31c917767af2e WHIRLPOOL c3288dc11f31dfca4c43aa6ecc6e4a2ea9c0bb181380ef373d1370b3d588614d5a33ef7db6b9523c6993424882266f4a57c19cac2e5314a82cb30e1267c5ed7a
 DIST nexus-2.10.0-02-bundle.tar.gz 50071813 SHA256 730442be2ca4918b44a69b98bb62abfcbf8ce8f997385349510dd807c1bf88d6 SHA512 22a75a71d279b34ad2c43c4360a5fcf6218494ab3772e7419a6817e86ee8682843402a727c720d410e79e0015dddd63a38049afddeb20dfb8a7860fa3bf057e2 WHIRLPOOL d025400ff050744a4632c6f30a7708ae912506dc9e924adccf73ce1ababeaf99c701b57ea9594370a71dbf41d8cc91917cbcbb3dada360f1eb990796923b8ea2
-EBUILD nexus-oss-bin-2.10.0.ebuild 1059 SHA256 d3c162464218231bfee1a00470fd7cd7b3b9a4626df742052f236796b711b322 SHA512 b3016fcf79812e2d08b9dbd6a11a286f276ecf9812a1761c473da5a158ad663c2ca3a4372dd42d548da77996f296501129fcf00717565dccbc9f99d6ac7108b7 WHIRLPOOL fb30bc08ce4d87a30ef317fc34a05dceba3fb04954e0f063fc0f64a91f8f79fbc8168b6fedf87dbb023695300e40447d1046d35a03536c2e7cac67a539f9d889
+EBUILD nexus-oss-bin-2.10.0.ebuild 1142 SHA256 f8365019e1fe74350fe701de939a1120867d894476ec3ee36342bff035a25248 SHA512 7bfa419597972b92d8d218e881b071b62dd91f356333b75ecd0019fca3e77cd656916dc4d82fa0c2a004b8953ff5673e16a926cbe165c598ce87352c9f3d0316 WHIRLPOOL f588ebf1173ac7b5169098afac6a195b6e464d40e6556afbd40c469c86c1cd4dcbedbfef5da222a86c5b1c9c5390dba4900e17ae4ccab836f8f681a84f10985f
diff --git a/dev-java/nexus-oss-bin/files/init.sh b/dev-java/nexus-oss-bin/files/init.sh
index 6e95a4d..5f71a62 100644
--- a/dev-java/nexus-oss-bin/files/init.sh
+++ b/dev-java/nexus-oss-bin/files/init.sh
@@ -15,12 +15,12 @@ start() {
     checkconfig || return 1
 
     ebegin "Starting ${SVCNAME}"
-    su $RUN_AS -c "/opt/nexus/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper start"
+    su $RUN_AS -c "/opt/nexus/nexus-oss-webapp/bin/nexus start"
     eend $?
 }
 
 stop() {
     ebegin "Stopping ${SVCNAME}"
-    su $RUN_AS -c "/opt/nexus/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper stop"
+    su $RUN_AS -c "/opt/nexus/nexus-oss-webapp/bin/nexus stop"
     eend $?
 }
diff --git a/dev-java/nexus-oss-bin/files/nexus-wrapper.patch b/dev-java/nexus-oss-bin/files/nexus-wrapper.patch
new file mode 100644
index 0000000..54040bb
--- /dev/null
+++ b/dev-java/nexus-oss-bin/files/nexus-wrapper.patch
@@ -0,0 +1,42 @@
+diff --git a/bin/nexus b/bin/nexus
+index 3f3a23c..4f69c5e 100755
+--- a/nexus-2.10.0-02/bin/nexus
++++ b/nexus-2.10.0-02/bin/nexus
+@@ -161,6 +161,37 @@ case "$DIST_ARCH" in
+     '9000/800')
+         DIST_ARCH="parisc"
+         ;;
++    *)
++        DIST_ARCH=`uname -m | tr [:upper:] [:lower:] | tr -d [:blank:]`
++        case "$DIST_ARCH" in
++            'athlon' | 'ia32' | 'i386' | 'i486' | 'i586' | 'i686')
++                DIST_ARCH="x86"
++                ;;
++            'amd64' | 'x86_64' | 'ia64')
++                DIST_ARCH="x86"
++                DIST_BITS=64
++                ;;
++            'ip27')
++                DIST_ARCH="mips"
++                ;;
++            'power' | 'powerpc' | 'power_pc')
++                DIST_ARCH="ppc"
++                ;;
++            'ppc64')
++                DIST_ARCH="ppc"
++                DIST_BITS=64
++                ;;
++            'pa_risc' | 'pa-risc')
++                DIST_ARCH="parisc"
++                ;;
++            'sun4u' | 'sparcv9')
++                DIST_ARCH="sparc"
++                ;;
++            '9000/800')
++                DIST_ARCH="parisc"
++                ;;
++        esac
++        ;;
+ esac
+ 
+ # Extra architecture detection
diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild
index fe98d8b..74f23f7 100644
--- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild
+++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild
@@ -1,3 +1,5 @@
+EAPI="5"
+
 inherit eutils user
 
 DESCRIPTION="Maven Repository Manager"
@@ -30,7 +32,11 @@ src_unpack() {
     unpack ${A}
     cd "${S}"
 
-#    epatch "${FILESDIR}/${P}.patch"
+#    epatch "${FILESDIR}/nexus-wrapper.patch"
+}
+
+src_prepare() {
+    epatch "${FILESDIR}/nexus-wrapper.patch"
 }
 
 src_install() {