diff --git a/dev-java/nexus-oss-bin/ChangeLog b/dev-java/nexus-oss-bin/ChangeLog
index d9a3b85..446868f 100644
--- a/dev-java/nexus-oss-bin/ChangeLog
+++ b/dev-java/nexus-oss-bin/ChangeLog
@@ -1,3 +1,7 @@
+  05 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  -files/nexus-wrapper-2.11.2.patch, nexus-oss-bin-2.11.4.ebuild:
+  dev-java/nexus-oss-bin:  fixed nexus ebuild for EAPI="6"
+
   01 Sep 2016; Manuel Friedli <manuel@fritteli.ch> -nexus-oss-bin-2.11.2.ebuild,
   -nexus-oss-bin-3.0.0.ebuild, nexus-oss-bin-2.11.4.ebuild,
   nexus-oss-bin-3.0.0-r1.ebuild:
diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest
index 3a0a51a..bd439de 100644
--- a/dev-java/nexus-oss-bin/Manifest
+++ b/dev-java/nexus-oss-bin/Manifest
@@ -1,9 +1,8 @@
 AUX init.sh 382 SHA256 fa0d82cbbe21b8e01195423a7cbd5e450504734df3a1cee7f1b58996682479b1 SHA512 b1bfc5c638b8827fecddf29ea07fb2252ce27ba3cd25a33e060a8c9104b1c61d1c786010f7647b3c2f941a7cc86e22c7e1456925cf011d1fd080299a3fc03e13 WHIRLPOOL 1bfb5712991f5a77d18f279e135e08de54a1545ee8749d47e9f7d1f2954c79efc313efeacd4273fdee91e42cd2c7fd2fe8de36e578cc7e092e32d5e6a94ed07f
-AUX nexus-wrapper-2.11.2.patch 1193 SHA256 f77229f2dddaae7205eec13188487ff73a663bbcd5d45b01201706044c1f18e0 SHA512 6f7230eeebe94e2cee426ffb3f1939c0a5e3b637002de7aef36608c4e95e399db1c9e28883f6e6a67cdff08804baa69efaae310871c3a9442508c72af556da6f WHIRLPOOL 2c3b48a30f4202177deb75d437a3aedc4ecf86870d4ab8e2ea79b5cb909a34630677f1fa006328554ea08807a88c1959fbf7e86ea49981dd1847687183d4ed70
 AUX nexus-wrapper-2.11.4.patch 1193 SHA256 031a5caf1355ab11ec474a77ca2b972b441a61caabeca14ad409ab53f2743549 SHA512 c6f3f978a0b96bd696bb5e1a12f67eb81063e98e2552169597f3c944e0e6ea42c734f398712959936538ac5f9d5f5eb6c7f1fc3e43a489325e5f3a69a7543bd7 WHIRLPOOL eff81fa1037b105096e10a940d51b5288d559a2a66fa852987c2f3aa072957c7e81d60d173de26c6f9302efbe52c667c2bdcbd7e745fb590ceb208945dbde875
 DIST nexus-2.11.4-01-bundle.tar.gz 70938260 SHA256 2901d00c7a5c287d0ab51980b0ea8ad6a3db936e6a9bc7aea573ec4e2b516719 SHA512 6d44422cb87d9b229b21ed564a9275cc3cda38ecf32de1002909750b421787c196702a811eb9f6e15726662ea13614c9d2715a8f944c8a67d5e9162b1e4eae93 WHIRLPOOL a73c37b4126f72b6b83ff9d043da46b01bb41342c7bf28a53503dd44a4c22a2da6e8af33aeb7e7229ed5b01c873576b955d5a7b9c536ed79a050ce49b0c1aa3d
 DIST nexus-3.0.0-03-unix.tar.gz 79751162 SHA256 0666769effc200a520825cce22d59a5a296d03795f72f57d0a97fbe61836d0ca SHA512 e4f728097f0b7e1232538cca2077a20cbd3ed487d86d6360cfb947a9439c9eab82fb286acb1d167f909bb158ef5914d0752e9c26f02bcce60864b7a6cec0ebe7 WHIRLPOOL 2cddeb27ed44ffd844a2c724f2db33206a331eb7dd9ad3e3de42a23afc703bed0eb8c5b76e3363f7c71c4f5897ae49a07a9801aaf424ec44baeff5c2a1c1450c
-EBUILD nexus-oss-bin-2.11.4.ebuild 1077 SHA256 3a9ceb3bfd43e8d139772dfe4853df87dbe4f320ebd1054b74bf5e11ef08acd0 SHA512 0eeacbaac03324405600b535d7f8423df1cb97caf6e93208ef92100f96a5a3f64a643100afdf594b8393571ea38ca2701c7d8dca2aaf39a26659f31fbfb64aa5 WHIRLPOOL b77abf24921315c3352b34cb68f7c2bea85bfe19a58f96fafd6fb5cf1f1d849785d3cd22d71b43c0b6437135be8aeaa505f63b87805e3ffaf7bd4baf31217ba0
+EBUILD nexus-oss-bin-2.11.4.ebuild 1063 SHA256 5a68c8c7973b3dfd22a5f58925a5e53b30a4da1faf4ec1a8b51c71c8cbcf0f4b SHA512 ed5bd734d7b53f876430b8c9f0803f67e7543c85f28680866326e5730e2292b46eb80e83445ce43b08a9770dd7292710fab6f1407a15e75fea96cc2f731a48f1 WHIRLPOOL f3c70a4cb24240dfbd728ee4feccb735bc4d8caf1d77b648611f2c36a7704da699f9b3c5f7bbeb8c5b4d81fe2c80ee71fcc142c4265fc6da2556dfeed93cc6af
 EBUILD nexus-oss-bin-3.0.0-r1.ebuild 1064 SHA256 f758b9ed498e9cba66a9c1333747e2fd4c7023db7255a9e8c6354abc5b5b371b SHA512 df3db681ff7f674f0a8c12ee30276a45bb2ed916da61a4e239856f699d12ff877b15202285d75635e73c5e54940c02b46ef0e9e1b3673a0baa34d8a5789c7144 WHIRLPOOL 7ee43d30c66388dbd4f85fdad45a06e49a6979547c63dd0b6d7c6a63714b2563b23ca7432cd5d57c5c060f3ae970a4e4583012ecf17d5821fdca9f795956ec17
-MISC ChangeLog 327 SHA256 5736ef849559541410ff71744aa83d7c842fc2839cbb2712fce7b118ef42ca4b SHA512 986d2be534bbad96cce9e2a69456a1c227c23f92972ebdfbd539abeb7572cd086d9134073ea5b7abf9a2bb7bb996d6e3ade54c59a9b80c5710abf1087a693a32 WHIRLPOOL e9401bf48e474b1b283b0637a0bf33e4ab4a41d2a183192f150a3195eb68c8f28acb70f3ea2324321e9ef3619c13d68183c590baf3db01c07dda34e5b9674c4d
+MISC ChangeLog 504 SHA256 9718100f7e020bcbacb303074daa93be7baf6487afb3a96c4eceaa25008f0d0f SHA512 22f8209f77695332c8069d7fbc0cf9d77fa8dc9246ebd52a18a08e5f33121413f7c4852d4533c7b39357b01404215537852d7aa00ffabd731adea19d455575b4 WHIRLPOOL 41617cdba514f69fa0bb4f700b898a06e336ce21fe8eaecb819d4bd45f1aa88e66d4658777cdafa419d901f56a7ac1c00093f65a5bb6d45230a554388390ddbf
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
diff --git a/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.2.patch b/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.2.patch
deleted file mode 100644
index 9aa017d..0000000
--- a/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/bin/nexus b/bin/nexus
-index 3f3a23c..4f69c5e 100755
---- a/nexus-2.11.2-06/bin/nexus
-+++ b/nexus-2.11.2-06/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.11.4.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild
index 26852bc..9414fad 100644
--- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild
+++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild
@@ -24,6 +24,8 @@ INSTALL_DIR="/opt/nexus"
 
 WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp"
 
+PATCHES=( "${FILESDIR}/nexus-wrapper-${PV}.patch" )
+
 pkg_setup() {
 	enewgroup nexus
 	enewuser nexus -1 /bin/bash /opt/nexus "nexus"
@@ -34,10 +36,6 @@ src_unpack() {
 	cd "${S}"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/nexus-wrapper-${PV}.patch"
-}
-
 src_install() {
 	insinto ${WEBAPP_DIR}
 	doins -r nexus-${PV}${SUB_VERSION}/*