diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 0b88b1893..f323a26a3 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,3 +1,4 @@
 DIST hplip-3.14.10-plugin.run 1869038 SHA256 b395b480ad86b9f27b6a2f63b6ecb00beb78e762a6137efb81dc1104837f9b81 SHA512 3e5bea924e989d902aea0de182941be692a124ba8c27f53ce2e4f137308bad8373462c6128c26716e481e758f76533163d311a2676df034c1b15d6ef6ed008be WHIRLPOOL 18375de4cc92cb73bcaa109927bd34f8487938b02472f0b7adbf44ad4688e5c6a1d030077b1e3c14f15f9b8e4cc86d195b0195e2d08121f746c62624db4658db
 DIST hplip-3.15.2-plugin.run 1869363 SHA256 35bbb2039882ab97dff10ccaffe780f4a0f0ddfe178e2d8f9a50f1e747451f49 SHA512 ff295d5a0709e312bfe1a18130b9d1635491bbf98fb2017cdee9f4ec1701302712d0252df0d44113e9a06866ea60df32654fbfdac1874e8a4bd1848e3675ad77 WHIRLPOOL 5a47a2736ed868f675121e24edb2043f5731b761b0b4e7904340b0497b47fe40e6ca99f41b7a5815d2b66a14f4a47648ce7e9da5e69ff4a994123de7d02b358c
 DIST hplip-3.15.4-plugin.run 1997539 SHA256 220d29360945dcbb9ad5a36831b2bbc2c1f7a141c004ef7ab6e69e8a0856f003 SHA512 ce87edb123325d5e286b835920ec521269b216b8027477638bdfb30279b3fc68fe47c934dbf46192b266a333a0faa4152ff7d9bc426cab3217169a58449d6313 WHIRLPOOL 3e6ee4b0e2f144be252372793741ee48ba99ab550748182a64f42017eb234167c50909d55ace06f11adc0b708d8bf7b0e441218d03227dea2f218e2f7fddfde5
+DIST hplip-3.15.6-plugin.run 1997580 SHA256 dd0d357c362710f1ae7e1381a83c881e60a3e6f6b8c49ccfd0418bf0a1ead5e7 SHA512 47697a161c1d8f4e07adccbcf10eb3b9ac1964c5691dbdaffc3e6a63ba640cdb4c4e36af86b73746d06105f78452ec6cb45497158e2c3fcd343f2f77625cb8a1 WHIRLPOOL 3612e7223b6f3cfd0714e76bddb71f41fe24e27b75313ca6b1698b57a84a4631273a17f7596c2a32c6caea8fa51a27930515413941c6127132b361fb0c872a77
diff --git a/net-print/hplip-plugin/hplip-plugin-3.15.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.15.6.ebuild
new file mode 100644
index 000000000..47ae60c82
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.15.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_PREBUILT="*"
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+/usr/share/hplip/scan/plugins/bb_marvell.so
+/usr/share/hplip/scan/plugins/bb_soapht.so
+/usr/share/hplip/scan/plugins/bb_soap.so
+/usr/share/hplip/fax/plugins/fax_marvell.so
+/usr/share/hplip/prnt/plugins/lj.so"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+	unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	mkdir -p "${ED}/var/lib/hp/"
+	cat >> "${ED}/var/lib/hp/hplip.state" << _EOF_
+[plugin]
+installed = 1
+eula = 1
+version = ${PV}
+_EOF_
+}
diff --git a/profiles/base/package.keywords/default b/profiles/base/package.keywords/default
index f3b183bba..633f19c65 100644
--- a/profiles/base/package.keywords/default
+++ b/profiles/base/package.keywords/default
@@ -7,8 +7,8 @@
 ~media-video/ffmpeg-2.6.3 amd64 x86
 ~net-analyzer/speedtest-cli-0.2.5 amd64 x86
 ~net-print/gutenprint-5.2.10 amd64 x86
-~net-print/hplip-3.15.4 amd64 x86
-~net-print/hplip-plugin-3.15.4 amd64 x86
+~net-print/hplip-3.15.6 amd64 x86
+~net-print/hplip-plugin-3.15.6 amd64 x86
 ~net-wireless/broadcom-sta-6.30.223.248 amd64 x86
 ~sys-apps/ethtool-3.18 amd64 x86
 ~sys-apps/inxi-2.2.19 amd64 x86