diff --git a/app-crypt/oclhashcat-bin/Manifest b/app-crypt/oclhashcat-bin/Manifest
index 0ec1b7800..1ff85aa54 100644
--- a/app-crypt/oclhashcat-bin/Manifest
+++ b/app-crypt/oclhashcat-bin/Manifest
@@ -1,3 +1,3 @@
-AUX oclhashcat 140 RMD160 bfa991360fcca26005ba07b642cdcf5a1504473b SHA1 2830c4b9271f0e127efbb7a6bf8b39c4a081a83c SHA256 b1c8dc056c8778deaac2aa308f9a7a3d4c9f3d53ecff75a84db20a8e0e868df8
+AUX oclhashcat 44 RMD160 6d34a293a9105023d125c46fa03c0d3fa1f1b08c SHA1 b33b80f37018f968a6fcda60ec126dc1510742c0 SHA256 438795558850278ea4e8940b8e3b671015317d12c8db0b0ca53c581b82fb81ac
 DIST oclHashcat-0.23.rar 17626227 RMD160 f976994999084455260d2ac7eb0e817d5d490d11 SHA1 4b7c6236b2db23cc12210c5c0cf136d5d99603f2 SHA256 44ca39632e3a9a4b92f436e9b98bd1930f6956d0039cc03414baf0c29c57f18b
-EBUILD oclhashcat-bin-0.23.ebuild 804 RMD160 4c7ce7977c05b7ee56718c294de6e2353a4cf763 SHA1 25fdefaf96c156c61178abf9bef5d7a804ef65ad SHA256 87acb8a2858634d74373a4f4a26dd57ffd216256f4e8965cc96a001af0564d79
+EBUILD oclhashcat-bin-0.23-r1.ebuild 927 RMD160 adf4784b86cafac0a157fda0f992fda7c1537bdc SHA1 1c208707d64fc050df77b12fff3dc4ab68a5787d SHA256 125f1676aa09e79389b83f73087080831c829b8c30d0b915c62bd094d9c8dad4
diff --git a/app-crypt/oclhashcat-bin/files/oclhashcat b/app-crypt/oclhashcat-bin/files/oclhashcat
index 6a65aa206..1a3906b4a 100644
--- a/app-crypt/oclhashcat-bin/files/oclhashcat
+++ b/app-crypt/oclhashcat-bin/files/oclhashcat
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-cd /usr/lib/oclhashcat-bin
-[ -e ./oclHashcat64.bin ] && ./oclHashcat64.bin $@
-[ -e ./oclHashcat32.bin ] && ./oclHashcat32.bin $@
+cd /opt/oclhashcat-bin
+/bin/bash
diff --git a/app-crypt/oclhashcat-bin/oclhashcat-bin-0.23.ebuild b/app-crypt/oclhashcat-bin/oclhashcat-bin-0.23-r1.ebuild
similarity index 59%
rename from app-crypt/oclhashcat-bin/oclhashcat-bin-0.23.ebuild
rename to app-crypt/oclhashcat-bin/oclhashcat-bin-0.23-r1.ebuild
index 932fd74bd..b0151c7ab 100755
--- a/app-crypt/oclhashcat-bin/oclhashcat-bin-0.23.ebuild
+++ b/app-crypt/oclhashcat-bin/oclhashcat-bin-0.23-r1.ebuild
@@ -4,7 +4,7 @@
 
 MY_P="oclHashcat-${PV}"
 
-inherit eutils
+inherit eutils pax-utils
 DESCRIPTION="An opencl multihash cracker"
 HOMEPAGE="http://hashcat.net/oclhashcat/"
 SRC_URI="http://hashcat.net/files/${MY_P}.rar"
@@ -15,21 +15,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch mirror"
 
-DEPEND="virtual/opencl-sdk
-		app-arch/unrar"
-RDEPEND="x11-drivers/nvidia-drivers"
+RDEPEND="|| ( x11-drivers/nvidia-drivers 
+	      x11-drivers/ati-drivers )
+	virtual/opencl"
+DEPEND="${RDEPEND}
+	app-arch/unrar"
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	dodoc example.*
-	rm -f oclHashcat.exe example.* batchcrack.sh docs
+	dodoc example.* batchcrack.sh
+	rm -rf oclHashcat.exe example.* batchcrack.sh docs
 	if use x86; then
 		rm oclHashcat64.bin
+		pax-mark m oclHashcat32.bin
 	else
 		rm oclHashcat32.bin
+		pax-mark m oclHashcat64.bin
 	fi
-	dodir /usr/lib/${PN}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN} || die "Copy files failed"
+	dodir /opt/${PN}
+	cp -R "${S}"/* "${D}"/opt/${PN} || die "Copy files failed"
 	dobin ${FILESDIR}/oclhashcat  || die "dobin failed"
 	chown -R root:0 "${D}"
 }