diff --git a/hplip.spec b/hplip.spec
index 0776e2a..62a9f05 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -3,7 +3,7 @@
 %define cups_ver %(cups-config --api-version)
 Name:          hplip
 Version:       3.16.11
-Release:       1mamba
+Release:       2mamba
 Summary:       A printer driver for HP inkjet devices
 Group:         System/Spooling
 Vendor:        openmamba
@@ -11,6 +11,7 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://hplipopensource.com/hplip-web/index.html
 Source:        http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
+Source1:       http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-%{version}-plugin.run
 Patch0:        %{name}-3.11.7-cups-1.5.patch
 Patch1:        %{name}-3.12.9-cups-1.6.patch
 Patch2:        hplip-3.14.4-openmamba-AUTH_TYPES-warning.patch
@@ -57,6 +58,15 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 A printer driver for HP inkjet devices.
 This package contains static libraries and header files need for development.
 
+%package plugin
+Group:         System/Libraries
+Summary:       Proprietary plugins for %{name}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description plugin
+A printer driver for HP inkjet devices.
+This package contains the proprietary plugins needed by some printers.
+
 %prep
 %setup -q
 #%patch0 -p1
@@ -70,6 +80,8 @@ This package contains static libraries and header files need for development.
 sed -i "s|chgrp \"lp\"|/bin/true \"lp\"|" Makefile.in
 sed -i "s|chmod 774|/bin/true 774|" Makefile.in
 
+sh %{SOURCE1} --target hplip-%{version}-plugin --noexec
+
 %build
 %configure \
    --enable-foomatic-drv-install \
@@ -96,7 +108,50 @@ rm -f %{buildroot}%{_sysconfdir}/sane.d/dll.conf
 # remove udev automatic printer configuration conflicting with system-config-printer
 rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules
 
+# install plugin
 install -d -m0755 %{buildroot}/var/lib/hp
+cd hplip-%{version}-plugin
+%ifarch %{ix86}
+_arch='x86_32'
+%endif
+%ifarch x86_64
+_arch='x86_64'
+%endif
+%ifarch arm
+_arch='arm32'
+%endif
+
+# Create folders
+install -d %{buildroot}%{_datadir}/hplip/data/firmware
+install -d %{buildroot}%{_datadir}/hplip/fax/plugins
+install -d %{buildroot}%{_datadir}/hplip/prnt/plugins
+install -d %{buildroot}%{_datadir}/hplip/scan/plugins
+install -d %{buildroot}%{_datadir}/licenses/hplip-plugin
+install -d %{buildroot}/var/lib/hp
+
+# Copy files
+install -m644 plugin.spec %{buildroot}%{_datadir}/hplip/
+install -m644 hp_laserjet_*.fw.gz %{buildroot}%{_datadir}/hplip/data/firmware/
+install -m755 fax_marvell-${_arch}.so %{buildroot}%{_datadir}/hplip/fax/plugins/
+install -m755 hbpl1-${_arch}.so %{buildroot}%{_datadir}/hplip/prnt/plugins/
+install -m755 lj-${_arch}.so %{buildroot}%{_datadir}/hplip/prnt/plugins/
+install -m755 bb_*-${_arch}.so %{buildroot}%{_datadir}/hplip/scan/plugins/
+install -m644 license.txt %{buildroot}%{_datadir}/licenses/hplip-plugin/
+
+# Create hplip.state used by hplip-tools
+cat > %{buildroot}/var/lib/hp/hplip.state << _EOF
+[plugin]
+installed = 1
+eula = 1
+version = %{version}
+_EOF
+
+# Create symlinks
+find %{buildroot}%{_datadir}/hplip -type f -name "*.so" | while read f; do
+   lib_dir="${f%/*}"
+   lib_name="${f##*/}"
+   ln -vsf $lib_name $lib_dir/${lib_name%%-*}.so
+done
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -185,6 +240,12 @@ fi
 %dir %attr(0755,root,lp) /var/lib/hp
 #%config(noreplace) /var/lib/hp/hplip.state
 #%dir %attr(0774,root,lp) /var/log/hp
+%exclude %{_datadir}/hplip/plugin.spec
+%exclude %{_datadir}/hplip/data/firmware/hp_laserjet_*.fw.gz
+%exclude %{_datadir}/hplip/fax/plugins/fax_marvell-*.so
+%exclude %{_datadir}/hplip/prnt/plugins/hbpl1-*.so
+%exclude %{_datadir}/hplip/prnt/plugins/lj-*.so 
+%exclude %{_datadir}/hplip/scan/plugins/bb_*-*.so
 
 %files devel
 %defattr(-,root,root)
@@ -199,7 +260,21 @@ fi
 %{_libdir}/sane/libsane-hpaio.la
 %{_datadir}/doc/*
 
+%files plugin
+%defattr(-,root,root)
+%{_datadir}/hplip/plugin.spec
+%{_datadir}/hplip/data/firmware/hp_laserjet_*.fw.gz
+%{_datadir}/hplip/fax/plugins/fax_marvell-*.so
+%{_datadir}/hplip/prnt/plugins/hbpl1-*.so
+%{_datadir}/hplip/prnt/plugins/lj-*.so 
+%{_datadir}/hplip/scan/plugins/bb_*-*.so
+%{_datadir}/licenses/hplip-plugin/license.txt
+%{_localstatedir}/lib/hp/hplip.state
+
 %changelog
+* Tue Apr 18 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 3.16.11-2mamba
+- addded proprietary plugins package
+
 * Sat Dec 03 2016 Automatic Build System <autodist@mambasoft.it> 3.16.11-1mamba
 - automatic version update by autodist