diff --git a/srcpkgs/chromium-pepper-flash/INSTALL b/srcpkgs/chromium-pepper-flash/INSTALL
index d1c66cf4463..0226c1f4881 100644
--- a/srcpkgs/chromium-pepper-flash/INSTALL
+++ b/srcpkgs/chromium-pepper-flash/INSTALL
@@ -1,11 +1,32 @@
 #
-# This script will advise the user to read the license for Chrome
-# and to re-login to have environment variables set properly
+# This script will install the actual plugin, advise the user to read the
+# license for Chrome and to re-login to have environment variables set
+# properly.
 #
+
+BUILD_DIR="./var/tmp/${PKGNAME}.build"
+
 case "${ACTION}" in
-pre)
-    ;;
 post)
+	. usr/lib/chromium-pepper-flash/chromium-pepper-vars.sh
+
+	mkdir -p "$BUILD_DIR"
+	(
+		cd "$BUILD_DIR"
+		xbps-uhelper fetch "${CHROME_URL}>$PKGNAME.deb"
+		echo "$CHROME_CHECKSUM  $PKGNAME.deb" > chksum
+		sha256sum -c chksum || exit 1
+
+		ar x "$PKGNAME.deb"
+		tar xf data.tar.lzma
+	) || {
+		echo Error while extracting;
+		rm -r $BUILD_DIR;
+		exit 1;
+	}
+	mv $BUILD_DIR/opt/google/chrome/PepperFlash/libpepflashplayer.so "usr/lib/chromium-pepper-flash"
+	mv $BUILD_DIR/opt/google/chrome/PepperFlash/manifest.json "usr/lib/chromium-pepper-flash"
+	rm -r $BUILD_DIR
     cat << _EOF
 =====================================================================
 
diff --git a/srcpkgs/chromium-pepper-flash/REMOVE b/srcpkgs/chromium-pepper-flash/REMOVE
new file mode 100644
index 00000000000..f90f32a4a6c
--- /dev/null
+++ b/srcpkgs/chromium-pepper-flash/REMOVE
@@ -0,0 +1,6 @@
+case "$ACTION" in
+pre)
+	rm usr/lib/chromium-pepper-flash/libpepflashplayer.so
+	rm usr/lib/chromium-pepper-flash/manifest.json
+	;;
+esac
diff --git a/srcpkgs/chromium-pepper-flash/files/chromium-pepper-vars.sh.in b/srcpkgs/chromium-pepper-flash/files/chromium-pepper-vars.sh.in
new file mode 100644
index 00000000000..1e2df84dbc1
--- /dev/null
+++ b/srcpkgs/chromium-pepper-flash/files/chromium-pepper-vars.sh.in
@@ -0,0 +1 @@
+export CHROME_URL="%CHROME_URL%" CHROME_CHECKSUM="%CHROME_CHECKSUM%"
diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template
index 214c15ea862..1fffc3c29e7 100644
--- a/srcpkgs/chromium-pepper-flash/template
+++ b/srcpkgs/chromium-pepper-flash/template
@@ -3,43 +3,50 @@ pkgname=chromium-pepper-flash
 version=12.0.0.77
 _chromeVersion=33.0.1750.149-1
 _channel='stable'
-revision=1
-distfiles="http://www.google.com/chrome/intl/en/eula_text.html"
-checksum=8dd9b0034b69d523eab459ee3b00379421e4e41b780014b0345aba5697a86bc4
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	_filename=google-chrome-${_channel}_${_chromeVersion}_amd64.deb
-	checksum+=" e64c08c47f46de2a16270aa31cead8588f1ff34f0d4aae4941cb1db7db366a48"
-elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	_filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb
-	checksum+=" e1fb67f4d1ea9ea3dbee812fc8e0c3e7dcedb611d768a6b016ecc463fa35d7ce"
-fi
-distfiles+=" http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${_filename}"
+_baseUrl="http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
+revision=2
 short_desc="Pepper Flash plugin for Chromium"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.google.com/chrome"
 license="chrome"
-
 lib32disabled=yes
 nonfree=yes
 only_for_archs="i686 x86_64"
-depends="chromium"
+depends="chromium binutils"
+create_wrksrc=yes
 
-do_extract() {
-	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename}
-	tar xf data.tar.lzma
-}
+case "${XBPS_TARGET_MACHINE}" in
+x86_64)
+	_filename=google-chrome-${_channel}_${_chromeVersion}_amd64.deb
+	_chromeChecksum+=" e64c08c47f46de2a16270aa31cead8588f1ff34f0d4aae4941cb1db7db366a48"
+	;;
+i686)
+	_filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb
+	_chromeChecksum+=" e1fb67f4d1ea9ea3dbee812fc8e0c3e7dcedb611d768a6b016ecc463fa35d7ce"
+	;;
+esac
+_chromeUrl="${_baseUrl}/${_filename}"
+distfiles="http://www.google.com/chrome/intl/en/eula_text.html>license.html ${_chromeUrl}"
+checksum="8dd9b0034b69d523eab459ee3b00379421e4e41b780014b0345aba5697a86bc4
+	$_chromeChecksum"
+
+skip_extraction="license.html $_filename"
 
 do_build() {
-	sed "s|%VERSION%|${version}|" ${FILESDIR}/chromium-pepper-flash.sh.in > chromium-pepper-flash.sh
+	sed \
+		-e "s|%VERSION%|${version}|" \
+			${FILESDIR}/chromium-pepper-flash.sh.in > chromium-pepper-flash.sh
+	sed \
+		-e "s|%CHROME_URL%|${_chromeUrl}|" \
+		-e "s|%CHROME_CHECKSUM%|${_chromeChecksum}|" \
+			${FILESDIR}/chromium-pepper-vars.sh.in > chromium-pepper-vars.sh
 }
 
 do_install() {
 	vmkdir "usr/lib/chromium-pepper-flash"
-	vcopy "opt/google/chrome/PepperFlash/*" "usr/lib/chromium-pepper-flash"
+	vcopy chromium-pepper-vars.sh "usr/lib/chromium-pepper-flash"
 
-	vmkdir "usr/share/licenses/chromium-pepper-flash"
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/eula_text.html license.html
-	vinstall "license.html" 644 "usr/share/licenses/chromium-pepper-flash"
+	vinstall "${XBPS_SRCDISTDIR}/$pkgname-$version/license.html" 644 "usr/share/licenses/chromium-pepper-flash"
 
 	vmkdir "etc/profile.d"
 	vinstall "chromium-pepper-flash.sh" 644 "etc/profile.d"