diff --git a/app-crypt/cryptohaze-combined/Manifest b/app-crypt/cryptohaze-combined/Manifest
index 3aa72e702..80a3515ba 100644
--- a/app-crypt/cryptohaze-combined/Manifest
+++ b/app-crypt/cryptohaze-combined/Manifest
@@ -1,3 +1,3 @@
 DIST Cryptohaze-Src_1_31.tar.bz2 5536082 SHA256 7fe5b3207c66cb46f60ec439f6d5d4af3efa4a42f16657e72a3b187c214d1139 SHA512 848333c81d953732f0cb73e6c917d3e16f6346e039924ddd49c7de728186a5d6960092ef1d5b78ecd66044c30ef10ff14202367f552f78eaf07392de9452d1eb WHIRLPOOL 4e800868f5a9b04521cfca335527643af5bc7ea203e9aa2f83188d963c230f75138b148aa81e8f0f43ff40af797c4200d5d91834380aa72ad5e8014ef9dacc91
-EBUILD cryptohaze-combined-1.31.ebuild 1612 SHA256 fe4d0c5d4403372a013a01a7ba4390a99781f65bb9e1ec77c8a7085fe8a2c555 SHA512 ce4c0b624cc5a069d017176ceffd68fee473a4285001c8db79fc9fca4de22df9462b3f8b0a8b669f2777491f9915bc28f37b276a0f389c6f01df3bc351f4fa3a WHIRLPOOL ab5d5b07cd938b8077211457640349a610fc9b793750f75bc39e5e18679c973c5b37dc29d6cea86de0ed114ebaa134c79b469a44f8d7721b34dd9824d69de295
-EBUILD cryptohaze-combined-9999.ebuild 1593 SHA256 3129b66bb13ae2cf2733f1d5de66dc324ef08471758549eda64fc871234258de SHA512 668e86c0c12a16c50b7e3773a42a8a9359200d2984e09c934674dcbebeedd30bcce882342b7118b744c3bb6f79e101b2791070f8ea29a42ed86ffc2030001660 WHIRLPOOL ecd529c613c243fe382a0463e7366edb30080c51b00cff9c3d732c41c5cac9800673764a1d918e16f26038df0b3ec51f3d6d2358cb3894da6ca6063259db0adf
+EBUILD cryptohaze-combined-1.31.ebuild 1542 SHA256 77086bc1e79cbdcba4b59ecd41e3ab3d037d20f6a0e5e40002e9756563cffd34 SHA512 e3be82896e8fc2cc878f69a373c040684574aefa82516d52c02ad39f28436f8469a1b4ddf88112d7d52a58283be6f7d61cc86c03657fb7288f2a4773abaf0525 WHIRLPOOL 501187747b8fffca3232ddbb922de2db3b8bb27cff6669766688187edf22b0e1db38e4556fa7bebb0072cc43183f8396427b3f840f62c511c1bde7f58466796a
+EBUILD cryptohaze-combined-9999.ebuild 1713 SHA256 2006f1c31546498bfb5c45baf6e14c7608eea607f887942d5bbe3c2efcc3a666 SHA512 f8eac28744ec5451a32544f849b6b4bdaa9cda789f5c2871bf7f4058f56f82e702504eccec9127ab26d37f21d5d9c7bf0402ba95f9ee78b639ba1328e73c67f1 WHIRLPOOL 7e26ae2867ac9c1b5de866aef81289e9e33b744814adc99f6affa15a3245c24469cf658e5328ff864c3790856065f3d8ceb212bd5f00ebd031caf8803cfd347f
diff --git a/app-crypt/cryptohaze-combined/cryptohaze-combined-1.31.ebuild b/app-crypt/cryptohaze-combined/cryptohaze-combined-1.31.ebuild
index 2a0085bed..6d4d34354 100644
--- a/app-crypt/cryptohaze-combined/cryptohaze-combined-1.31.ebuild
+++ b/app-crypt/cryptohaze-combined/cryptohaze-combined-1.31.ebuild
@@ -46,11 +46,11 @@ src_install() {
 	do
 		if [ "${i}" != "kernels" ]
 		then
-	                echo '#! /bin/sh' > "${ED}"/usr/bin/${i}
-	                echo "cd /opt/${PN}" >> "${ED}"/usr/bin/${i}
-        	        echo 'echo "Warning: running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/${i}
-                	echo "./${i} $@" >> "${ED}"/usr/bin/${i}
-	                fperms +x /usr/bin/${i}
+			echo '#! /bin/sh' > "${ED}"/usr/bin/${i}
+			echo "cd /opt/${PN}" >> "${ED}"/usr/bin/${i}
+			echo 'echo "Warning: running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/${i}
+			echo "./${i} $@" >> "${ED}"/usr/bin/${i}
+			fperms +x /usr/bin/${i}
 		fi
 	done
 }
diff --git a/app-crypt/cryptohaze-combined/cryptohaze-combined-9999.ebuild b/app-crypt/cryptohaze-combined/cryptohaze-combined-9999.ebuild
index 10d41f189..3d445d834 100644
--- a/app-crypt/cryptohaze-combined/cryptohaze-combined-9999.ebuild
+++ b/app-crypt/cryptohaze-combined/cryptohaze-combined-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit cmake-utils
+inherit cmake-utils pax-utils
 
 DESCRIPTION="GPU and OpenCL accelerated password auditing tools for security professionals"
 HOMEPAGE="http://www.cryptohaze.com/"
@@ -14,10 +14,9 @@ REQUIRED_USE="|| ( video_cards_nvidia video_cards_fglrx )"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE_VIDEO_CARDS="video_cards_fglrx
-        video_cards_nvidia"
+IUSE_VIDEO_CARDS="video_cards_fglrx video_cards_nvidia"
 
-IUSE="${IUSE_VIDEO_CARDS}"
+IUSE="${IUSE_VIDEO_CARDS} pax_kernel"
 
 DEPEND="dev-libs/argtable
 	net-misc/curl
@@ -47,11 +46,14 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
+	if use pax_kernel; then
+		pax-mark m "${ED}"/usr/share/cryptohaze-combined/Cryptohaze-Multiforcer
+	fi
 
 	dodir /usr/bin
-	for i in $(ls -1 ${ED}/usr/share/${PN})
+	for i in $(ls -1 "${ED}/usr/share/${PN}")
 	do
-		if [ -f ${ED}/usr/share/${PN}/${i} ]
+		if [ -f "${ED}/usr/share/${PN}/"${i} ]
 		then
 			cat <<-EOF > "${ED}"/usr/bin/${i}
 				#! /bin/sh