diff --git a/extra/hplip/fix_install.patch b/extra/hplip/fix_install.patch
new file mode 100644
index 000000000..adbec2c57
--- /dev/null
+++ b/extra/hplip/fix_install.patch
@@ -0,0 +1,23 @@
+--- hplip-3.18.7/Makefile.am	2018-07-15 22:08:37.000000000 +0200
++++ hplip-3.18.7/Makefile.am.new	2018-08-08 19:54:20.671794852 +0200
+@@ -680,14 +680,14 @@
+ install-data-hook:
+ if HPLIP_BUILD
+ 	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
++		cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \
++		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_64.so ; \
++		ln -sf $(libdir)/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ 	fi; \
+ 	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
++		cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \
++		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_32.so ; \
++		ln -sf $(libdir)/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ 	fi
+ if !HPLIP_CLASS_DRIVER
+ #	   If scanner build, add hpaio entry to sane dll.conf.
diff --git a/extra/hplip/python.patch b/extra/hplip/python.patch
new file mode 100644
index 000000000..b75d1f598
--- /dev/null
+++ b/extra/hplip/python.patch
@@ -0,0 +1,11 @@
+--- hplip-3.18.7/base/utils.py	2018-07-15 22:08:37.000000000 +0200
++++ hplip-3.18.7/base/utils.py.new	2018-08-08 21:46:48.721947940 +0200
+@@ -265,7 +265,7 @@
+     try:
+         names = os.listdir(root)
+     except os.error:
+-        raise StopIteration
++        return
+ 
+     pattern = pattern or '*'
+     pat_list = pattern.split(';')