diff --git a/dev-util/amd-stream-sdk/Manifest b/dev-util/amd-stream-sdk/Manifest
index 81554ec1f..56f64ab33 100644
--- a/dev-util/amd-stream-sdk/Manifest
+++ b/dev-util/amd-stream-sdk/Manifest
@@ -1,4 +1,6 @@
-AUX 99amdstream 68 RMD160 7b84d3862b10e7d4403701a00db6c087b503a919 SHA1 8e92922eeedac472f8436ecc0a3f0b620477ada2 SHA256 f0f2db26068a7e2c20ec7ce5932ca2eea70ccefc099300b6deea6d4e2b4e4f0c
+AUX 99amdstream 72 RMD160 d647948e33d979bfcac2b4c2fbb858cb4a254043 SHA1 d414422e4b39d4ca398c049f2dd739af2c9ee728 SHA256 119872cd4933505233beb356b8d9bbb5362057b6c311886e27ca4e90b06ccf82
+AUX 99amdstream~ 105 RMD160 7aa3a6e8b749b9ac6608c9eb1c38db4b9e779d3a SHA1 eae253a1eba270691a60ba78d29191798ea6f828 SHA256 a3651ca31efeed1866c2580e0b9ff7a0fe73b94b6136b4c59ff99ec75d295b45
 DIST amdstream-1.3.0_beta-lnx32.tar.gzip 20609837 RMD160 86891a26db8c1f7c56ca813515b0643c6522426e SHA1 7e31ea7ff250a148069064bb41f94a454428da48 SHA256 a980815ca7e0673cda6002cd80cf5a1d579189e2c59a551645561cd78a8b448a
 DIST amdstream-1.3.0_beta-lnx64.tar.gzip 21379454 RMD160 09ba3c5b0dda950949de32f8ff3f08e053d76e18 SHA1 2925231ac58de12717dbd3c3246c8250e9484cf9 SHA256 82e371d4af462b31c9b99b7be45b9280a7e0ba2cd13d954d3bee4a44111f7fc5
-EBUILD amd-stream-sdk-1.3.0_beta.ebuild 1786 RMD160 67672df9209ab46200ba3e9cd1f2c887265a99e2 SHA1 17e440e67eceff24c74d872795ebb6ea9592c7c2 SHA256 d59df46734947bd306d76de0aa018cd5924976a1cbb06e12ba566e8dfa2ac58e
+EBUILD amd-stream-sdk-1.3.0_beta.ebuild 2291 RMD160 1d39d9f38d2f9efb4a1592e4cf6bb42fc9d4c997 SHA1 1fe4e94a46d952efce6329fa8cc3d9e917363c3f SHA256 9992b536397490695a7135b0cc11b68463138b9bb2ee62f629c39029e45cd146
+MISC amd-stream-sdk-1.3.0_beta.ebuild~ 2293 RMD160 b60aadaeaa1a2ffd7ff2d92034bc41386afb9dbe SHA1 6b51310e58f58f9dd9ddf1373fc38f5ab4faa8c8 SHA256 e157ff3d9d920eaa4cb69da95bea1644b3007be4415fc82bdf273cdf94768be8
diff --git a/dev-util/amd-stream-sdk/amd-stream-sdk-1.3.0_beta.ebuild b/dev-util/amd-stream-sdk/amd-stream-sdk-1.3.0_beta.ebuild
index 3b0d2aa1a..2da9e4f22 100644
--- a/dev-util/amd-stream-sdk/amd-stream-sdk-1.3.0_beta.ebuild
+++ b/dev-util/amd-stream-sdk/amd-stream-sdk-1.3.0_beta.ebuild
@@ -9,51 +9,66 @@ SRC_URI="amd64? ( http://www2.ati.com/sdkdwnld/amdstream-${PV}-lnx64.tar.gzip )
 LICENSE="AMD GPL-1 as-is"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="doc examples"
 RESTRICT="strip"
 DEPEND="app-arch/rpm2targz"
 RDEPEND=">=x11-drivers/ati-drivers-8.561"
 
 src_unpack() {
-	mkdir "${S}"
-	tar -xzf "${DISTDIR}/${A}" -C "${S}"
-}
-
-src_compile() {
+	mkdir -p "${S}"
+	tar -xzf "${DISTDIR}/${A}" -C "${WORKDIR}"
 	if use x86; then
-		
-		einfo "Unpacking AMD-Cal"
-		dd if="${S}/amdstream-cal-${PV}.i386.run" of="${S}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
-		
+#		einfo "Unpacking AMD-Cal"
+#		dd if="${WORKDIR}/amdstream-cal-${PV}.i386.run" of="${WORKDIR}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
 		einfo "Unpacking AMD-Brook"
-		dd if="${S}/amdstream-brook-${PV}.i386.run" of="${S}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
-	
+		dd if="${WORKDIR}/amdstream-brook-${PV}.i386.run" of="${WORKDIR}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
 	else
-		
-		einfo "Unpacking AMD-Cal"
-		dd if="${S}/amdstream-cal-${PV}.x86_64.run" of="${S}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
-
+#		einfo "Unpacking AMD-Cal"
+#		dd if="${WORKDIR}/amdstream-cal-${PV}.x86_64.run" of="${WORKDIR}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
 		einfo "Unpacking AMD-Brook"
-		dd if="${S}/amdstream-brook-${PV}.x86_64.run" of="${S}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
-	
+		dd if="${WORKDIR}/amdstream-brook-${PV}.x86_64.run" of="${WORKDIR}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
 	fi
 
+	cd ${WORKDIR}
 	einfo "Converting rpm to tar"
-	mkdir AMD-Cal
-	tar xvf amdcal.tar.gz -C AMD-Cal >& /dev/null
+#	mkdir AMD-Cal
+#	tar xf amdcal.tar.gz -C AMD-Cal >& /dev/null
 	mkdir AMD-Brook
-	tar xvf amdbrook.tar.gz -C AMD-Brook >& /dev/null
+	tar xf amdbrook.tar.gz -C AMD-Brook >& /dev/null
 	
-	cd "${S}/AMD-Cal"
-	rpm2tar amdstream-cal-${PV}-1.*.rpm
-	cd "${S}/AMD-Brook"
+#	cd "${WORKDIR}/AMD-Cal"
+#	rpm2tar amdstream-cal-${PV}-1.*.rpm
+	cd "${WORKDIR}/AMD-Brook"
 	rpm2tar amdstream-brook-${PV}-1.*.rpm
+
+#	einfo "Extracting AMD-Cal"
+#	tar xf "${WORKDIR}"/AMD-Cal/amdstream-cal-${PV}-1.*.tar -C "${S}"
+	einfo "Extracting AMD-Brook"
+	tar xf "${WORKDIR}"/AMD-Brook/amdstream-brook-${PV}-1.*.tar -C "${S}"
 }
 
 src_install() {
-	einfo "Installing AMD-Cal"
-	tar xvf "${S}"/AMD-Cal/amdstream-cal-${PV}-1.*.tar -C "${D}/"
-	einfo "Installing AMD-Brook"
-	tar xvf "${S}"/AMD-Brook/amdstream-brook-${PV}-1.*.tar -C "${D}/"
+	local DEST=/opt/amdbrook
+	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/amdbrook/sdk/bin/*
+	dolib usr/local/amdbrook/sdk/lib/*
+
+	insinto ${DEST}/include
+	doins -r usr/local/amdbrook/sdk/include/*
+
+	insinto ${DEST}/utils
+	doins -r usr/local/amdbrook/utils/*
+
 	newenvd "${FILESDIR}/99amdstream" 99amdstream || die "Failed to install env file."
 }
diff --git a/dev-util/amd-stream-sdk/files/99amdstream b/dev-util/amd-stream-sdk/files/99amdstream
index 299024475..8ddb2c3a7 100644
--- a/dev-util/amd-stream-sdk/files/99amdstream
+++ b/dev-util/amd-stream-sdk/files/99amdstream
@@ -1,2 +1,3 @@
-PATH=/usr/local/amdbrook/sdk/bin
-LDPATH=/usr/local/amdbrook/sdk/lib
+PATH=/opt/amdbrook/bin
+ROOTPATH=/opt/amdbrook/bin
+LDPATH=/opt/amdbrook/lib