diff --git a/srcpkgs/chromium-pepper-flash/INSTALL b/srcpkgs/chromium-pepper-flash/INSTALL
new file mode 100644
index 00000000000..d1c66cf4463
--- /dev/null
+++ b/srcpkgs/chromium-pepper-flash/INSTALL
@@ -0,0 +1,27 @@
+#
+# This script will advise the user to read the license for Chrome
+# and to re-login to have environment variables set properly
+#
+case "${ACTION}" in
+pre)
+    ;;
+post)
+    cat << _EOF
+=====================================================================
+
+- The Pepper Adobe Flashplayer package is licensed software.
+
+	You MUST read and agree to the license stored in
+	/usr/share/licenses/chromium-pepper-flash/license.html
+	before using it.
+
+- Please re-login to update CHROME_FLAGS or re-source
+  /etc/profile:
+
+	$ source /etc/profile
+
+=====================================================================
+_EOF
+    ;;
+esac
+
diff --git a/srcpkgs/chromium-pepper-flash/files/chromium-pepper-flash.sh.template b/srcpkgs/chromium-pepper-flash/files/chromium-pepper-flash.sh.template
new file mode 100644
index 00000000000..826fe1d5f4e
--- /dev/null
+++ b/srcpkgs/chromium-pepper-flash/files/chromium-pepper-flash.sh.template
@@ -0,0 +1 @@
+export CHROME_FLAGS="--ppapi-flash-path=/usr/lib/chromium-pepper-flash/libpepflashplayer.so --ppapi-flash-version='%VERSION%'"
diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template
new file mode 100644
index 00000000000..478dde0f20a
--- /dev/null
+++ b/srcpkgs/chromium-pepper-flash/template
@@ -0,0 +1,46 @@
+# Template file for 'chromium-pepper-flash'
+pkgname=chromium-pepper-flash
+version=12.0.0.44
+_chromeVersion=32.0.1700.107-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+=" ca74beffd21e919d0f39fe2daa2e9b7b7924ea00af3ab82e8b97a76f9c0a50ec"
+elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	_filename=google-chrome-${_channel}_${_chromeVersion}_i386.deb
+	checksum+=" 023c0aee10a7a972cabee33cd936bf59b356d2cfd59c74cdc5daa665d7fed8ea"
+fi
+distfiles+=" http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${_filename}"
+short_desc="Pepper Flash plugin for Chromium"
+maintainer="Enno Boland <eb@s01.de>"
+homepage="http://www.google.com/chrome"
+license="chrome"
+
+nonfree=yes
+only_for_archs="i686 x86_64"
+depends="chromium"
+makedepends="binutils"
+
+do_extract() {
+	ar x ${XBPS_SRCDISTDIR}/${_filename}
+	tar xf data.tar.lzma
+}
+
+do_build() {
+	sed "s|%VERSION%|${version}|" ${FILESDIR}/chromium-pepper-flash.sh.template > chromium-pepper-flash.sh
+}
+
+do_install() {
+	vmkdir "usr/lib/chromium-pepper-flash"
+	vcopy "opt/google/chrome/PepperFlash/*" "usr/lib/chromium-pepper-flash"
+
+	vmkdir "usr/share/licenses/chromium-pepper-flash"
+	vinstall "${XBPS_SRCDISTDIR}/eula_text.html" 644 "usr/share/licenses/chromium-pepper-flash/license.html"
+
+	vmkdir "usr/share/licenses/chromium-pepper-flash/license.html"
+	vinstall "chromium-pepper-flash.sh" 644 "etc/profile.d"
+}
diff --git a/srcpkgs/chromium/files/chromium.sh b/srcpkgs/chromium/files/chromium.sh
index e1c3388e511..92c19fc4057 100644
--- a/srcpkgs/chromium/files/chromium.sh
+++ b/srcpkgs/chromium/files/chromium.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export CHROME_WRAPPER=/usr/lib/chromium/chromium
 export CHROME_DESKTOP=chromium.desktop
-exec /usr/lib/chromium/chromium "$@"
+exec /usr/lib/chromium/chromium $CHROME_FLAGS "$@"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index db0f4109c9a..ed169659833 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -2,7 +2,7 @@
 pkgname=chromium
 #See http://www.chromium.org/developers/calendar for the latest version
 version=32.0.1700.107
-revision=1
+revision=2
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"