diff --git a/dev-util/ati-stream-sdk-bin/Manifest b/dev-util/ati-stream-sdk-bin/Manifest
index fe7da7bf3..7b4a709de 100644
--- a/dev-util/ati-stream-sdk-bin/Manifest
+++ b/dev-util/ati-stream-sdk-bin/Manifest
@@ -1,7 +1,5 @@
-AUX 99atistream 75 RMD160 a244f9d5f863113e13ef146e14a87cf1a290036c SHA1 91fd22c4637020e78980db8ecb81e43ba48b6da6 SHA256 e3d92019faf7adca88e1657a38f0c068b8a7068830a66b2de870b96ffbc295a2
 AUX gcc-4.3-atistream.patch 30743 RMD160 467fb93385172685ff054f721f1863ce398e6167 SHA1 fe8a12cb2af2287359c5b6ce458e8c1dfb33c253 SHA256 612c742447e4281972bd111312e29a36592da6b5316a3c72b5f5b2cd74576882
 DIST ati-stream-sdk-v2.01-lnx64.tgz 62171129 RMD160 19e763d5aa0fe4795905c18c38aa0289d7215828 SHA1 1c34782307687c17e2f221185bd1dea3e93a9812 SHA256 588d2621ff9aae5a3a72a5c5f97c81b792c5969c56b3c9176722dc6a0a56baf2
-DIST atistream-1.4.0_beta-lnx32.tar.gzip 19977989 RMD160 8f0c7eb75b35bb7e75ba4ba031811a845188280e SHA1 5b6519e969b033142eca035963f36eb4e1642660 SHA256 3a93d88d80c6c7480978314f8358305308f607509619c8cc92db5df7d35a3939
-DIST atistream-1.4.0_beta-lnx64.tar.gzip 20987385 RMD160 c83bd09a10de5bd0c5b568081f3f8ca3c2cee8e8 SHA1 3942df0716781e1d5a5ec8a7e50c75931275ff8b SHA256 664e2152eb29072db92e3ae0f0eff82d45240f19117ab1cb2a75bd744bc3ac3c
-EBUILD ati-stream-sdk-bin-1.4.0_beta.ebuild 2338 RMD160 a36093e8623661f71dbb643d7234fe35d07b9946 SHA1 25bcf46ba304089d327c625460e638a6e9c80d0f SHA256 06a571e8459ee108245ac671d31cbaab774099f6cea7e8c1dc4d374fcda40135
+DIST ati-stream-sdk-v2.2-lnx64.tgz 73427109 RMD160 e7e4d094241e47a68f559877d0263f65b0fc1901 SHA1 e0e4edaf280922936d1f2a0938a28a209ed0c4c9 SHA256 50e77acdb4aa7c8b0e97c49d6806b47ee3d33e22c32f4f432c26de74aeb84b18
 EBUILD ati-stream-sdk-bin-2.01.ebuild 1642 RMD160 3428d75548cccc24eb8d694f7ecc297764e6a300 SHA1 bb89a3f4dfe7e5335c1b31dce739417bc53a0570 SHA256 c9a1191c9a6b1eb410a170d5dba060b48e1e72b14e8e43732f80612c6df5e9e0
+EBUILD ati-stream-sdk-bin-2.2.ebuild 2020 RMD160 58b997eaceeae3fa1aad45343f0a6a6efb2f7edc SHA1 754416e3084febfef7eea6fa912ac7756f7ee1e0 SHA256 46ebf1dd20c0f415b173a8693c707b2bd3cbb583703af65d1a51e04df66d9878
diff --git a/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-1.4.0_beta.ebuild b/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-1.4.0_beta.ebuild
deleted file mode 100644
index a876f1549..000000000
--- a/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-1.4.0_beta.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Enable compiling code and loading it on ATI/AMD GPU"
-HOMEPAGE="http://ati.amd.com/technology/streamcomputing/sdkdwnld.htm"
-BASE_URI="http://download-developer.amd.com/GPU/executables/atistream-${PV}"
-SRC_URI="amd64? ( ${BASE_URI}-lnx64.tar.gzip ) 
-         x86? ( ${BASE_URI}-lnx32.tar.gzip )"
-
-LICENSE="AMD GPL-1 as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="livecd"
-RESTRICT="strip"
-DEPEND="app-arch/rpm2targz"
-RDEPEND=" !livecd? ( >=x11-drivers/ati-drivers-8.561 )
-	 !dev-util/amd-stream-sdk-bin"
-
-src_unpack() {
-	mkdir -p "${S}"
-	tar -xzf "${DISTDIR}/${A}" -C "${WORKDIR}"
-	if use x86; then
-		MY_ARCH="i386"
-	else
-		MY_ARCH="x86_64"
-	fi
-
-	einfo "Unpacking ATI-Cal"
-	dd if="${WORKDIR}/atistream-cal-${PV}.${MY_ARCH}.run" of="${WORKDIR}/atical.tar.gz" bs=16384 skip=1 >& /dev/null
-	einfo "Unpacking ATI-Brook"
-	dd if="${WORKDIR}/atistream-brook-${PV}.${MY_ARCH}.run" of="${WORKDIR}/atibrook.tar.gz" bs=16384 skip=1 >& /dev/null
-
-	cd ${WORKDIR}
-	einfo "Converting rpm to tar"
-	mkdir ATI-Cal
-	tar xf atical.tar.gz -C ATI-Cal >& /dev/null
-	mkdir ATI-Brook
-	tar xf atibrook.tar.gz -C ATI-Brook >& /dev/null
-	
-	cd "${WORKDIR}/ATI-Cal"
-	rpm2tar atistream-cal-${PV}-1.*.rpm
-	cd "${WORKDIR}/ATI-Brook"
-	rpm2tar atistream-brook-${PV}-1.*.rpm
-
-	einfo "Extracting ATI-Cal"
-	tar xf "${WORKDIR}"/ATI-Cal/atistream-cal-${PV}-1.*.tar -C "${S}"
-	einfo "Extracting ATI-Brook"
-	tar xf "${WORKDIR}"/ATI-Brook/atistream-brook-${PV}-1.*.tar -C "${S}"
-
-	cd "${S}"
-	epatch "${FILESDIR}/gcc-4.3-atistream.patch"
-}
-
-src_install() {
-	local DEST=/opt/atibrook
-	if use amd64 ; then
-		MY_BASE_DIR="${BASE_DIR}_64a"
-		ARCH_DIR="lnx64"
-	else
-		MY_BASE_DIR="${BASE_DIR}"
-		ARCH_DIR="lnx32"
-	fi
-
-	# don't use lib32 or lib64 directories
-	unset ABI
-
-	into ${DEST}
-	dobin usr/local/atibrook/sdk/bin/*
-	dolib usr/local/atibrook/sdk/lib/*
-
-	insinto ${DEST}/include
-	doins -r usr/local/atibrook/platform/include/*
-	doins -r usr/local/atical/include/*
-	insinto ${DEST}/include/brook
-	for file in `find usr/local/atibrook/platform/runtime/ -name \*.h`
-	do
-		doins "${file}"
-	done
-
-	insinto ${DEST}/utils
-	doins -r usr/local/atibrook/utils/*
-
-	newenvd "${FILESDIR}/99atistream" 99atistream || die "Failed to install env file."
-}
diff --git a/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-2.2.ebuild b/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-2.2.ebuild
new file mode 100644
index 000000000..7e38a6b31
--- /dev/null
+++ b/dev-util/ati-stream-sdk-bin/ati-stream-sdk-bin-2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+DESCRIPTION="Enable compiling code and loading it on ATI/AMD GPU"
+HOMEPAGE="http://ati.amd.com/technology/streamcomputing/sdkdwnld.htm"
+SRC_URI="http://download2-developer.amd.com/amd/Stream20GA/ati-stream-sdk-v${PV}-lnx64.tgz"
+
+LICENSE="AMD GPL-1 as-is"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="livecd examples doc"
+RESTRICT="strip"
+RDEPEND="!livecd? ( >=x11-drivers/ati-drivers-10.1 )
+	app-admin/eselect-opencl
+	examples? ( media-libs/glew )"
+#	!x11-drivers/nvidia-drivers"
+
+src_install() {
+	local DEST=/opt/ati-stream-sdk
+	insinto ${DEST}
+	
+	cd ati-stream-sdk-v${PV}-lnx64 || die
+
+	# Install executables
+	insopts -m0755
+	doins -r bin
+
+	# Install libraries
+
+	doins -r lib
+
+	# There should be something like eselect opencl, to switch
+	# between OpenCL implementations  	
+	if use amd64; then
+# Managed by eselect opencl
+#		dosym ../..${DEST}/lib/x86_64/libOpenCL.so   /usr/lib64/
+#		dosym ../..${DEST}/lib/x86/libOpenCL.so      /usr/lib32/
+		dosym ../..${DEST}/lib/x86_64/libatiocl64.so /usr/lib64/
+		dosym ../..${DEST}/lib/x86/libatiocl32.so    /usr/lib32/
+	else
+# Managed by eselect opencl
+#		dosym ../..${DEST}/lib/x86/libOpenCL.so    /usr/lib/
+		dosym ../..${DEST}/lib/x86/libatiocl32.so  /usr/lib/
+	fi
+    
+	# Install includes
+	# only selected header; not  glew
+	insinto ${DEST}/include
+	insopts -m0644
+	doins  include/cal*.h
+	doins -r include/CL
+	doins -r include/GL
+    
+	# Install examples & docs
+	if use examples; then
+		insinto ${DEST}
+		doins -r samples
+		doins -r make
+	fi
+
+	if use doc; then
+		insinto ${DEST}
+		doins -r docs
+	fi
+
+	# install OpenCL installable client driver
+	# What should we do with the absolute symlink?
+	dodir   /etc/OpenCL/vendors
+	if use amd64; then
+		echo "libatiocl64.so" > ${D}/etc/OpenCL/vendors/atiocl64.icd
+	fi
+	echo "libatiocl32.so" > ${D}/etc/OpenCL/vendors/atiocl32.icd
+
+	# Create env file
+	echo "ATISTREAMSDKROOT=${DEST}" > 99${PN}
+	doenvd 99${PN}
+
+}
diff --git a/dev-util/ati-stream-sdk-bin/files/99atistream b/dev-util/ati-stream-sdk-bin/files/99atistream
deleted file mode 100644
index 631229a6a..000000000
--- a/dev-util/ati-stream-sdk-bin/files/99atistream
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/opt/atibrook/bin
-ROOTPATH=/opt/atibrook/bin
-LDPATH=/opt/atibrook/lib