diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 0747721aca4..84eb34c6068 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2016/01/17 17:29:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.138 2016/02/25 03:50:37 ajacoutot Exp $
 
 PORTROACH=		skipv:${V}_py2.5
 
@@ -11,7 +11,7 @@ COMMENT-hpcups=		HP native CUPS driver
 COMMENT-hpijs=		HP ghostscript driver (spooler independent)
 COMMENT-gui=		HPLIP graphical tools
 
-V=			3.15.11
+V=			3.16.2
 DISTNAME=		hplip-${V}
 SUBST_VARS=		V
 
@@ -22,9 +22,6 @@ PKGNAME-hpcups=		hpcups-${V}
 PKGNAME-hpijs=		hpijs-${V}
 PKGNAME-gui=		hplip-gui-${V}
 
-REVISION-main=		0
-REVISION-hpaio=		0
-
 SHARED_LIBS +=  hpdiscovery          0.0      # 0.1
 SHARED_LIBS +=  hpmud                2.0      # 0.6
 SHARED_LIBS +=  hpipp                0.0      # 0.1
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index e62dcacd4f0..c54494f17be 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.15.11.tar.gz) = M8RxG94Eo0uB8/cOYnegN13e0XFGnlqouc7xoUpAfG0=
-SIZE (hplip-3.15.11.tar.gz) = 22277756
+SHA256 (hplip-3.16.2.tar.gz) = 8shFqdSKi6K3TMriHimCmrySncbHTitbGd8B6ld+1Nk=
+SIZE (hplip-3.16.2.tar.gz) = 22285808
diff --git a/print/hplip/patches/patch-Makefile_in b/print/hplip/patches/patch-Makefile_in
index 53bfb9cde92..dc4ead33659 100644
--- a/print/hplip/patches/patch-Makefile_in
+++ b/print/hplip/patches/patch-Makefile_in
@@ -1,25 +1,25 @@
-$OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
---- Makefile.in.orig	Thu Nov 12 11:30:23 2015
-+++ Makefile.in	Tue Nov 17 09:26:50 2015
-@@ -92,7 +92,7 @@ DIST_COMMON = $(am__configure_deps) \
- @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_3 = io/hpmud/musb_libusb01.c 
- @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_4 = -lusb
- @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_5 = io/hpmud/musb.c 
--@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_6 = -I/usr/include/libusb-1.0
-+@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_6 = -I${LOCALBASE}/include/libusb-1.0
- @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = -lusb-1.0
- @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_8 = -l$(SNMPLIB) -lcrypto
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_9 =  \
-@@ -115,7 +115,7 @@ DIST_COMMON = $(am__configure_deps) \
- 
- # IPP library
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_12 = libhpipp.la
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_13 = -I/usr/include/libusb-1.0 
-+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_13 = -I${LOCALBASE}/include/libusb-1.0 
- @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_14 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
+$OpenBSD: patch-Makefile_in,v 1.41 2016/02/25 03:50:37 ajacoutot Exp $
+--- Makefile.in.orig	Mon Feb  8 10:44:16 2016
++++ Makefile.in	Wed Feb 10 09:17:15 2016
+@@ -94,7 +94,7 @@ DIST_COMMON = $(am__configure_deps) \
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_5 = io/hpmud/musb_libusb01.c 
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_6 = -lusb
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_7 = io/hpmud/musb.c 
+-@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I/usr/include/libusb-1.0
++@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I${LOCALBASE}/include/libusb-1.0
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb-1.0
+ @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_10 = -Iprotocol/discovery
+ @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_11 = -l$(SNMPLIB) -lcrypto
+@@ -120,7 +120,7 @@ DIST_COMMON = $(am__configure_deps) \
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_15 = libhpipp.la
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_16 = libhpdiscovery.la
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@am__append_17 = -Iprotocol/discovery
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_18 = -I/usr/include/libusb-1.0 
++@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_18 = -I${LOCALBASE}/include/libusb-1.0 
+ @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_19 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@	ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@	ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
-@@ -4663,10 +4663,10 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -4668,13 +4668,13 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@        scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \
  @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c
  
@@ -27,21 +27,24 @@ $OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
 +@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -avoid-version
  @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
  # The following is a interlibrary dependency that must be compiled first.
--@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl
-+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpdiscovery.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD =  \
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	libhpip.la libhpmud.la \
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	libhpipp.la $(DBUS_LIBS) \
+-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	-lcups -ldl $(am__append_1)
++@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	-lcups $(am__append_1)
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol -Iprotocol/discovery
- @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h
-@@ -4680,7 +4680,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS =  \
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@	$(DBUS_CFLAGS) -Iprotocol \
+@@ -4690,7 +4690,7 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@	-DCONFDIR=\"$(hplip_confdir)\" -Iprotocol \
- @HPLIP_BUILD_TRUE@	-Iprotocol/discovery $(am__append_6)
+ @HPLIP_BUILD_TRUE@	$(am__append_8) $(am__append_10)
  @HPLIP_BUILD_TRUE@libhpmud_la_LDFLAGS = -version-info 0:6:0 -lpthread \
--@HPLIP_BUILD_TRUE@	-ldl $(am__append_4) $(am__append_7) \
-+@HPLIP_BUILD_TRUE@	$(am__append_4) $(am__append_7) \
- @HPLIP_BUILD_TRUE@	$(am__append_8)
+-@HPLIP_BUILD_TRUE@	-ldl $(am__append_6) $(am__append_9) \
++@HPLIP_BUILD_TRUE@	$(am__append_6) $(am__append_9) \
+ @HPLIP_BUILD_TRUE@	$(am__append_11)
  @HPLIP_BUILD_TRUE@libhpmud_la_SOURCES = io/hpmud/hpmud.c \
  @HPLIP_BUILD_TRUE@	io/hpmud/mlc.c io/hpmud/model.c \
-@@ -4721,7 +4721,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -4731,7 +4731,7 @@ cups_drv = prnt/drv/hpcups.drv
  @HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -50,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
  @HPLIP_BUILD_TRUE@dist_hplip_state_DATA = 
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
-@@ -4917,7 +4917,7 @@ cups_drv = prnt/drv/hpcups.drv
+@@ -4928,7 +4928,7 @@ cups_drv = prnt/drv/hpcups.drv
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@@ -59,7 +62,7 @@ $OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
  
  # hplip.desktop
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
-@@ -4982,8 +4982,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4993,8 +4993,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  
  @HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@@ -70,7 +73,7 @@ $OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
  
  # hpcups
  #if NEW_HPCUPS
-@@ -5023,7 +5023,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -5034,7 +5034,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  @HPCUPS_INSTALL_TRUE@	common/utils.c common/utils.h
  
  @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@@ -79,7 +82,7 @@ $OpenBSD: patch-Makefile_in,v 1.40 2015/11/17 08:57:45 ajacoutot Exp $
  
  #else
  #hpcupsdir = $(cupsfilterdir)
-@@ -5032,15 +5032,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -5043,15 +5043,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  #hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  #hpcups_CFLAGS = $(libapdk_la_CFLAGS)
  #if HPCUPS_ONLY_BUILD
diff --git a/print/hplip/patches/patch-base_g_py b/print/hplip/patches/patch-base_g_py
index c4e56be1082..187e4c6e4ce 100644
--- a/print/hplip/patches/patch-base_g_py
+++ b/print/hplip/patches/patch-base_g_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_g_py,v 1.11 2015/02/05 17:34:33 ajacoutot Exp $
---- base/g.py.orig	Thu Jan 29 13:20:35 2015
-+++ base/g.py	Thu Feb  5 16:44:52 2015
-@@ -178,16 +178,16 @@ class ConfigBase(object):
+$OpenBSD: patch-base_g_py,v 1.12 2016/02/25 03:50:37 ajacoutot Exp $
+--- base/g.py.orig	Mon Feb  8 10:42:52 2016
++++ base/g.py	Wed Feb 10 09:14:55 2016
+@@ -182,16 +182,16 @@ class ConfigBase(object):
          
  class SysConfig(ConfigBase):
      def __init__(self):
@@ -23,7 +23,7 @@ $OpenBSD: patch-base_g_py,v 1.11 2015/02/05 17:34:33 ajacoutot Exp $
  
  
  class UserConfig(ConfigBase):
-@@ -279,9 +279,9 @@ prop.max_message_len = 8192
+@@ -283,9 +283,9 @@ prop.max_message_len = 8192
  prop.max_message_read = 65536
  prop.read_timeout = 90
  
diff --git a/print/hplip/patches/patch-base_utils_py b/print/hplip/patches/patch-base_utils_py
index d1087532e20..2ba86c33646 100644
--- a/print/hplip/patches/patch-base_utils_py
+++ b/print/hplip/patches/patch-base_utils_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
---- base/utils.py.orig	Thu Jan 29 13:20:35 2015
-+++ base/utils.py	Thu Feb  5 14:42:09 2015
-@@ -140,11 +140,11 @@ for s in EXPECT_WORD_LIST:
+$OpenBSD: patch-base_utils_py,v 1.17 2016/02/25 03:50:37 ajacoutot Exp $
+--- base/utils.py.orig	Mon Feb  8 10:42:52 2016
++++ base/utils.py	Wed Feb 10 09:20:26 2016
+@@ -138,11 +138,11 @@ for s in EXPECT_WORD_LIST:
  def get_cups_systemgroup_list():
      lis = []
      try:
@@ -16,7 +16,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
          except OSError:
              return lis
  
-@@ -586,7 +586,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -584,7 +584,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_pcard = 'hp-unload -d %DEVICE_URI%'
          else:
@@ -25,7 +25,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  
          # Copy
          path = which('hp-makecopies')
-@@ -594,7 +594,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -592,7 +592,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_copy = 'hp-makecopies -d %DEVICE_URI%'
          else:
@@ -34,7 +34,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  
          # Fax
          path = which('hp-sendfax')
-@@ -602,7 +602,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -600,7 +600,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_fax = 'hp-sendfax -d %FAX_URI%'
          else:
@@ -43,7 +43,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  
          # Fax Address Book
          path = which('hp-fab')
-@@ -610,7 +610,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -608,7 +608,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_fab = 'hp-fab'
          else:
@@ -52,7 +52,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  
      def load(self):
          self.loadDefaults()
-@@ -951,10 +951,9 @@ def all(S,f=lambda x:x):
+@@ -949,10 +949,9 @@ def all(S,f=lambda x:x):
          if not f(x): return False
      return True
  
@@ -65,7 +65,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  def find_browser():
      if platform_avail and platform.system() == 'Darwin':
          return "open"
-@@ -1997,51 +1996,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
+@@ -2013,51 +2012,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
  def download_from_network(weburl, outputFile = None, useURLLIB=False):
      retValue = -1
  
@@ -108,7 +108,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
 -        if useURLLIB:
 +            if useURLLIB:
  		
--            sys.stdout.write("Download in progress..........")
+-            #sys.stdout.write("Download in progress..........")
 -            try:
 -                response = urllib2_request.urlopen(weburl)    
 -                file_fd = open(outputFile, 'wb')
@@ -117,7 +117,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
 -            except urllib2_error.URLError as e:
 -                log.error("Failed to open URL: %s" % weburl)
 -                return retValue, ""
-+                sys.stdout.write("Download in progress..........")
++                #sys.stdout.write("Download in progress..........")
 +                try:
 +                    response = urllib2_request.urlopen(weburl)    
 +                    file_fd = open(outputFile, 'wb')
@@ -153,7 +153,7 @@ $OpenBSD: patch-base_utils_py,v 1.16 2015/02/05 17:34:33 ajacoutot Exp $
  class Sync_Lock:
      def __init__(self, filename):
          self.Lock_filename = filename
-@@ -2137,7 +2139,7 @@ def check_user_groups(required_grps_str, avl_grps):
+@@ -2153,7 +2155,7 @@ def check_user_groups(required_grps_str, avl_grps):
          grps =re.sub(r'\s', '', str(grps))
          exp_grp_list = grps.split(',')
      else:
diff --git a/print/hplip/patches/patch-installer_core_install_py b/print/hplip/patches/patch-installer_core_install_py
index 56f20dc7e65..ca389761281 100644
--- a/print/hplip/patches/patch-installer_core_install_py
+++ b/print/hplip/patches/patch-installer_core_install_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot Exp $
---- installer/core_install.py.orig	Thu Nov 12 11:28:50 2015
-+++ installer/core_install.py	Tue Nov 17 09:23:50 2015
+$OpenBSD: patch-installer_core_install_py,v 1.26 2016/02/25 03:50:37 ajacoutot Exp $
+--- installer/core_install.py.orig	Mon Feb  8 10:43:42 2016
++++ installer/core_install.py	Wed Feb 10 09:14:55 2016
 @@ -110,7 +110,7 @@ HPLIP_LIST=['*.py','*.pyc', 'base', 'copier','data','i
  
  PLUGIN_LIST=['fax/plugins/','prnt/plugins/','scan/plugins/']
@@ -44,7 +44,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
              'pil':              (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME,'-','FUNC#get_pil_version',GENERALDEP),
              # Optional fax packages
              'reportlab':        (False, ['fax'], REPORTLAB_STR, self.check_reportlab, DEPENDENCY_RUN_TIME,'2.0','FUNC#get_reportlab_version',GENERALDEP),
-@@ -846,7 +846,7 @@ class CoreInstall(object):
+@@ -859,7 +859,7 @@ class CoreInstall(object):
  
  
      def check_make(self):
@@ -53,7 +53,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
      def check_libusb(self):
-@@ -855,14 +855,14 @@ class CoreInstall(object):
+@@ -868,14 +868,14 @@ class CoreInstall(object):
              if not check_lib('libusb'):
                  return False
              if self.distro_name != "rhel":
@@ -70,7 +70,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
              else:
                  return True
  
-@@ -872,11 +872,10 @@ class CoreInstall(object):
+@@ -885,11 +885,10 @@ class CoreInstall(object):
  
  
      def check_libcrypto(self):
@@ -84,7 +84,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
      def check_libnetsnmp(self):
-@@ -922,7 +921,7 @@ class CoreInstall(object):
+@@ -935,7 +934,7 @@ class CoreInstall(object):
  
  
      def check_sane_devel(self):
@@ -93,7 +93,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
      def check_xsane(self):
-@@ -979,7 +978,7 @@ class CoreInstall(object):
+@@ -992,7 +991,7 @@ class CoreInstall(object):
  
  
      def check_python_devel(self):
@@ -102,7 +102,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
          Found = False
          for p in dir_list:
                if check_file('Python.h',dir=p):
-@@ -1033,9 +1032,8 @@ class CoreInstall(object):
+@@ -1046,9 +1045,8 @@ class CoreInstall(object):
  
  
      def check_dbus(self):
@@ -114,7 +114,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
      def check_cups_devel(self):
-@@ -1053,12 +1051,12 @@ class CoreInstall(object):
+@@ -1066,12 +1064,12 @@ class CoreInstall(object):
  
  
      def check_cups_image(self):
@@ -129,7 +129,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
      def check_libtool(self):
-@@ -1078,7 +1076,7 @@ class CoreInstall(object):
+@@ -1091,7 +1089,7 @@ class CoreInstall(object):
      def check_cupsddk(self):
          log.debug("Checking for cups-ddk...")
          # TODO: Compute these paths some way or another...
@@ -138,7 +138,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
  
  
-@@ -1129,7 +1127,7 @@ class CoreInstall(object):
+@@ -1142,7 +1140,7 @@ class CoreInstall(object):
  
      def check_hpaio(self):
          found = False
@@ -147,7 +147,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
              log.debug("'Checking for hpaio' in '%s'..." % path)
              try:
                  f = open(path, 'r')
-@@ -1158,12 +1156,12 @@ class CoreInstall(object):
+@@ -1171,12 +1169,12 @@ class CoreInstall(object):
          if pat.match(home_dir) is not None:
              usrlib_dir= pat.match(home_dir).group(1) + "lib/"
              if os.path.exists(usrlib_dir+'sane/libsane-hpaio.so.1'):
@@ -164,7 +164,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
                      log.debug("cmd=%s"%cmd)
                      utils.run(cmd, self.passwordObj)
                  else:
-@@ -1176,19 +1174,19 @@ class CoreInstall(object):
+@@ -1189,19 +1187,19 @@ class CoreInstall(object):
                      f.close()
  
                  if not found:
@@ -189,7 +189,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
                      cmd= self.passwordObj.getAuthCmd()%cmd
                      log.debug("cmd=%s"%cmd)
                      utils.run(cmd, self.passwordObj)
-@@ -1610,11 +1608,14 @@ class CoreInstall(object):
+@@ -1623,11 +1621,14 @@ class CoreInstall(object):
  
  
      def check_wget(self):
@@ -208,7 +208,7 @@ $OpenBSD: patch-installer_core_install_py,v 1.25 2015/11/17 08:57:45 ajacoutot E
  
      def check_avahi_utils(self):
          if utils.which("avahi-browse"):
-@@ -1700,7 +1701,7 @@ class CoreInstall(object):
+@@ -1713,7 +1714,7 @@ class CoreInstall(object):
      def pre_build(self,distro_ver=None):
          cmds = []
          if self.get_distro_ver_data('fix_ppd_symlink', False,distro_ver):
diff --git a/print/hplip/patches/patch-scan_py b/print/hplip/patches/patch-scan_py
index 0b48e1b27fd..7cd6faf3680 100644
--- a/print/hplip/patches/patch-scan_py
+++ b/print/hplip/patches/patch-scan_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-scan_py,v 1.14 2015/11/17 08:57:45 ajacoutot Exp $
---- scan.py.orig	Thu Nov 12 11:29:04 2015
-+++ scan.py	Tue Nov 17 09:23:50 2015
-@@ -1143,7 +1143,7 @@ try:
+$OpenBSD: patch-scan_py,v 1.15 2016/02/25 03:50:37 ajacoutot Exp $
+--- scan.py.orig	Mon Feb  8 10:43:43 2016
++++ scan.py	Wed Feb 10 09:14:55 2016
+@@ -1147,7 +1147,7 @@ try:
              elif d == 'print':
                  hp_print = utils.which("hp-print", True)
                  if not hp_print:
diff --git a/print/hplip/pkg/PLIST-hpijs b/print/hplip/pkg/PLIST-hpijs
index bc2870c5892..410593436b7 100644
--- a/print/hplip/pkg/PLIST-hpijs
+++ b/print/hplip/pkg/PLIST-hpijs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.44 2015/11/17 08:57:45 ajacoutot Exp $
+@comment $OpenBSD: PLIST-hpijs,v 1.45 2016/02/25 03:50:37 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @conflict hpcups-<=3.2.11
 @pkgpath print/hpijs
@@ -272,8 +272,6 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_4620_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_4640_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_4670_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_4720_series-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_5570_series-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_5640_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_500-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_500c-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_505j-hpijs.ppd.gz
@@ -287,7 +285,9 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_5520_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5550-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5551-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5552-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_5570_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5600-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-deskjet_5640_series-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5650-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5652-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_5700-hpijs.ppd.gz
@@ -716,6 +716,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m127fs-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
@@ -1038,4 +1039,3 @@ share/foomatic/db/source/PPD/HP/hp-psc_920-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-psc_950-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-psc_950vr-hpijs.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-psc_950xi-hpijs.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-scanjet_pro_3500_f1-hpijs.ppd.gz