diff --git a/dev-util/amd-stream-sdk/Manifest b/dev-util/amd-stream-sdk/Manifest
index 4432b1950..49e12ef58 100644
--- a/dev-util/amd-stream-sdk/Manifest
+++ b/dev-util/amd-stream-sdk/Manifest
@@ -1,4 +1,4 @@
 AUX 99amdstream 68 RMD160 7b84d3862b10e7d4403701a00db6c087b503a919 SHA1 8e92922eeedac472f8436ecc0a3f0b620477ada2 SHA256 f0f2db26068a7e2c20ec7ce5932ca2eea70ccefc099300b6deea6d4e2b4e4f0c
 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 1756 RMD160 81c19cae489d0ebc4db2f2d470fe275ee7bbcc5a SHA1 a6ce21d1ed14f2a7486ba69b2cde9c631cf52f34 SHA256 d605bd678e2a5e985a46a6f4b7017989500257881f3b5d86922eb9414897c2d3
+EBUILD amd-stream-sdk-1.3.0_beta.ebuild 1768 RMD160 0dd5d6dae7b13acb25c78d563af7101952a52f6b SHA1 5aabd3b943e6974310e8d061b0d54ba85c1f7491 SHA256 70f3bccfe1894a50f5ebac58469c2e22251cc90fb15ffac2d4bf1dc76c0aa564
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 1bd0539bf..357d14f10 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
@@ -10,29 +10,31 @@ LICENSE="AMD GPL-1 as-is"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
-
+RESTRICT="strip"
 DEPEND=""
 RDEPEND=">=x11-drivers/ati-drivers-8.561"
 
 src_unpack() {
-	tar -zxf ${A}
-	cd ${WORKDIR}
+	mkdir "${S}"
+	tar -xzf "${DISTDIR}/${A}" -C "${S}"
+}
 
+src_compile() {
 	if use x86; then
 		
 		einfo "Unpacking AMD-Cal"
-		dd if=${WORKDIR}/amdstream-cal-${PV}.i386.run of=${WORKDIR}/amdcal.tar.gz bs=1 skip=16384 >& /dev/null
+		dd if="${S}/amdstream-cal-${PV}.i386.run" of="${S}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
 		
 		einfo "Unpacking AMD-Brook"
-		dd if=${WORKDIR}/amdstream-brook-${PV}.i386.run of=${WORKDIR}/amdbrook.tar.gz bs=1 skip=16384 >& /dev/null
+		dd if="${S}/amdstream-brook-${PV}.i386.run" of="${S}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
 	
 	else
 		
 		einfo "Unpacking AMD-Cal"
-		dd if=${WORKDIR}/amdstream-cal-${PV}.x86_64.run of=${WORKDIR}/amdcal.tar.gz bs=1 skip=16384 >& /dev/null
+		dd if="${S}/amdstream-cal-${PV}.x86_64.run" of="${S}/amdcal.tar.gz" bs=1 skip=16384 >& /dev/null
 
 		einfo "Unpacking AMD-Brook"
-		dd if=${WORKDIR}/amdstream-brook-${PV}.x86_64.run of=${WORKDIR}/amdbrook.tar.gz bs=1 skip=16384 >& /dev/null
+		dd if="${S}/amdstream-brook-${PV}.x86_64.run" of="${S}/amdbrook.tar.gz" bs=1 skip=16384 >& /dev/null
 	
 	fi
 
@@ -42,16 +44,16 @@ src_unpack() {
 	mkdir AMD-Brook
 	tar xvf amdbrook.tar.gz -C AMD-Brook >& /dev/null
 	
-	cd ${WORKDIR}/AMD-Cal
+	cd "${S}/AMD-Cal"
 	rpm2tar amdstream-cal-${PV}-1.*.rpm
-	cd ${WORKDIR}/AMD-Brook
+	cd "${S}/AMD-Brook"
 	rpm2tar amdstream-brook-${PV}-1.*.rpm
 }
 
 src_install() {
 	einfo "Installing AMD-Cal"
-	tar xvf ${WORKDIR}/AMD-Cal/amdstream-cal-${PV}-1.*.tar -C ${D}/
+	tar xvf "${S}"/AMD-Cal/amdstream-cal-${PV}-1.*.tar -C "${D}/"
 	einfo "Installing AMD-Brook"
-	tar xvf ${WORKDIR}/AMD-Brook/amdstream-brook-${PV}-1.*.tar -C ${D}/
+	tar xvf "${S}"/AMD-Brook/amdstream-brook-${PV}-1.*.tar -C "${D}/"
 	newenvd "${FILESDIR}/99amdstream" 99amdstream || die "Failed to install env file."
 }