diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 3159f319a09..033bdeabc43 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.168 2018/12/14 07:42:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.169 2019/02/24 10:40:43 ajacoutot Exp $
 
 PORTROACH=		skipv:${V}_py2.5
 
@@ -9,7 +9,7 @@ COMMENT-hpcups=		HP native CUPS driver
 COMMENT-hpijs=		HP ghostscript driver (spooler independent)
 COMMENT-gui=		HPLIP graphical tools
 
-V=			3.18.12
+V=			3.19.1
 DISTNAME=		hplip-${V}
 SUBST_VARS=		V
 
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index bb8e0d84a24..97a61eb8269 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.18.12.tar.gz) = O6UnjV/K+D7NBNFoUPLyTEPHjBGJwVrjLK51Y2DC+r0=
-SIZE (hplip-3.18.12.tar.gz) = 24588202
+SHA256 (hplip-3.19.1.tar.gz) = 9We4pAW8jrhB9LeMFUP3YRYL8+MiXdjM4aH3UQ7Bgc4=
+SIZE (hplip-3.19.1.tar.gz) = 24530780
diff --git a/print/hplip/patches/patch-Makefile_in b/print/hplip/patches/patch-Makefile_in
index 42ed1e288e9..89ddcb95a08 100644
--- a/print/hplip/patches/patch-Makefile_in
+++ b/print/hplip/patches/patch-Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.54 2018/12/14 07:42:00 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.55 2019/02/24 10:40:43 ajacoutot Exp $
 
 https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
 
@@ -41,7 +41,7 @@ Index: Makefile.in
  	installer/text_install.py data/localization/hplip_de.ts \
  	data/localization/hplip_es.ts data/localization/hplip_fr.ts \
  	data/localization/hplip_it.ts data/localization/hplip_pt.ts \
-@@ -4278,7 +4277,7 @@ dist_unrel_DATA = 
+@@ -4211,7 +4210,7 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h
  
@@ -50,7 +50,7 @@ Index: Makefile.in
  @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@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@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la \
-@@ -4286,7 +4285,6 @@ dist_unrel_DATA = 
+@@ -4219,7 +4218,6 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	libhpipp.la \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	$(DBUS_LIBS) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	-lcups \
@@ -58,7 +58,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	$(am__append_1)
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \
-@@ -4307,7 +4305,6 @@ dist_unrel_DATA = 
+@@ -4240,7 +4238,6 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@libhpmud_la_LDFLAGS =  \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	-version-info \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	0:6:0 -lpthread \
@@ -66,7 +66,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_6) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_9) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_11)
-@@ -4361,7 +4358,7 @@ dist_unrel_DATA = 
+@@ -4294,7 +4291,7 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -75,7 +75,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@dist_hplip_state_DATA = 
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
-@@ -4561,7 +4558,7 @@ dist_unrel_DATA = 
+@@ -4494,7 +4491,7 @@ dist_unrel_DATA = 
  @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)
@@ -84,7 +84,7 @@ Index: Makefile.in
  
  # hplip.desktop
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
-@@ -4630,8 +4627,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4563,8 +4560,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)
@@ -95,7 +95,7 @@ Index: Makefile.in
  
  # hpcups
  #if NEW_HPCUPS
-@@ -4675,7 +4672,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4608,7 +4605,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  @HPCUPS_INSTALL_TRUE@	prnt/hpcups/ImageProcessor.h
  
  @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@@ -104,7 +104,7 @@ Index: Makefile.in
  #else
  #hpcupsdir = $(cupsfilterdir)
  #hpcups_PROGRAMS = hpcups
-@@ -4683,15 +4680,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4616,15 +4613,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  #hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  #hpcups_CFLAGS = $(libapdk_la_CFLAGS)
  #if HPCUPS_ONLY_BUILD
@@ -123,7 +123,7 @@ Index: Makefile.in
  dat2drvdir = $(hplipdir)
  dat2drv_SOURCES = Common.h  Dat2drv.cpp  Dat2drv.h Normalize.cpp  Normalize.h
  @GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11
-@@ -9386,16 +9383,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
+@@ -9319,16 +9316,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
  
  
  install-data-hook:
diff --git a/print/hplip/patches/patch-base_utils_py b/print/hplip/patches/patch-base_utils_py
index 93d35335442..bba459454b2 100644
--- a/print/hplip/patches/patch-base_utils_py
+++ b/print/hplip/patches/patch-base_utils_py
@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_utils_py,v 1.19 2018/10/31 14:14:30 ajacoutot Exp $
+$OpenBSD: patch-base_utils_py,v 1.20 2019/02/24 10:40:43 ajacoutot Exp $
 
 Index: base/utils.py
 --- base/utils.py.orig
@@ -18,7 +18,7 @@ Index: base/utils.py
          except OSError:
              return lis
  
-@@ -584,7 +584,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -585,7 +585,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_pcard = 'hp-unload -d %DEVICE_URI%'
          else:
@@ -27,7 +27,7 @@ Index: base/utils.py
  
          # Copy
          path = which('hp-makecopies')
-@@ -592,7 +592,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -593,7 +593,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_copy = 'hp-makecopies -d %DEVICE_URI%'
          else:
@@ -36,7 +36,7 @@ Index: base/utils.py
  
          # Fax
          path = which('hp-sendfax')
-@@ -600,7 +600,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -601,7 +601,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_fax = 'hp-sendfax -d %FAX_URI%'
          else:
@@ -45,7 +45,7 @@ Index: base/utils.py
  
          # Fax Address Book
          path = which('hp-fab')
-@@ -608,7 +608,7 @@ class UserSettings(object): # Note: Deprecated after 2
+@@ -609,7 +609,7 @@ class UserSettings(object): # Note: Deprecated after 2
          if len(path):
              self.cmd_fab = 'hp-fab'
          else:
@@ -54,7 +54,7 @@ Index: base/utils.py
  
      def load(self):
          self.loadDefaults()
-@@ -970,10 +970,9 @@ def all(S,f=lambda x:x):
+@@ -971,10 +971,9 @@ def all(S,f=lambda x:x):
          if not f(x): return False
      return True
  
@@ -67,7 +67,7 @@ Index: base/utils.py
  def find_browser():
      if platform_avail and platform.system() == 'Darwin':
          return "open"
-@@ -2057,51 +2056,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
+@@ -2058,51 +2057,54 @@ def chunk_write(response, out_fd, chunk_size =8192, st
  def download_from_network(weburl, outputFile = None, useURLLIB=False):
      retValue = -1
  
@@ -155,7 +155,7 @@ Index: base/utils.py
  class Sync_Lock:
      def __init__(self, filename):
          self.Lock_filename = filename
-@@ -2197,7 +2199,7 @@ def check_user_groups(required_grps_str, avl_grps):
+@@ -2198,7 +2200,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-scan_py b/print/hplip/patches/patch-scan_py
index 43d6688cda0..6a77fd8b915 100644
--- a/print/hplip/patches/patch-scan_py
+++ b/print/hplip/patches/patch-scan_py
@@ -1,9 +1,9 @@
-$OpenBSD: patch-scan_py,v 1.17 2018/12/14 07:42:00 ajacoutot Exp $
+$OpenBSD: patch-scan_py,v 1.18 2019/02/24 10:40:43 ajacoutot Exp $
 
 Index: scan.py
 --- scan.py.orig
 +++ scan.py
-@@ -1950,7 +1950,7 @@ try:
+@@ -1954,7 +1954,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 1b11269ab68..0bf1fb89bc4 100644
--- a/print/hplip/pkg/PLIST-hpijs
+++ b/print/hplip/pkg/PLIST-hpijs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.58 2018/12/14 07:42:00 ajacoutot Exp $
+@comment $OpenBSD: PLIST-hpijs,v 1.59 2019/02/24 10:40:43 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @conflict hpcups-<=3.2.11
 @pkgpath print/hpijs
@@ -41,11 +41,9 @@ share/foomatic/db/source/PPD/HP/hp-business_inkjet_3000-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-business_inkjet_3000-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-color_inkjet_cp1700.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_inkjet_printer_cp1700.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_1600.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-color_laserjet_2500-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_2500-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_2500_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_2500_series.ppd.gz
@@ -80,7 +78,6 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_4550-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4600-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4600-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4600_series-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-color_laserjet_4600_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4610-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4610-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_4650-pcl3.ppd.gz
@@ -102,7 +99,6 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_8550-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_8550-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500_mfp-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm1015-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cm1017-ps.ppd.gz
@@ -359,7 +355,6 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_672c.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_680.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_6800.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_682.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_690.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_690c.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_692.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_693.ppd.gz
@@ -429,8 +424,6 @@ share/foomatic/db/source/PPD/HP/hp-deskjet_f2400_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f300_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4100_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4200_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_f4210_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-deskjet_f4213_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4400_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f4500_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-deskjet_f735.ppd.gz
@@ -474,7 +467,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_1100.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1100a.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1100xi.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1150.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_1160.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1160_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1200-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_1200-ps.ppd.gz
@@ -504,14 +496,11 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2100-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_2100.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2100_series-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2100_series-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_2200-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2200-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2200_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2200_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_2300-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2300-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2300_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_2300_series.ppd.gz
@@ -535,9 +524,7 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_3055.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3100.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3150.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3200.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200m-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3200m-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_3200se.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_3330.ppd.gz
@@ -583,7 +570,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_4si-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_4v-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_4v-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_5000-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_5000.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_500_color_m551-ps.ppd.gz
@@ -616,7 +602,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_6p.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_700_m712-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_8000-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_8000.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_8000_series-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_8000_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_8100_mfp-ps.ppd.gz
@@ -655,8 +640,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_cp1025.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_cp1025nw.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_cp1520_series-ps.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_cp_1025.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_cp_1025nw.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_e60055-e60075-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_e62555-e62575-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
@@ -807,7 +790,6 @@ share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1219nf_mfp.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1102.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1102w.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1106.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1106w.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-laserjet_professional_p1107.ppd.gz
@@ -855,9 +837,6 @@ share/foomatic/db/source/PPD/HP/hp-officejet_4620_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_4630_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_4650_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5100_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-officejet_5105.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-officejet_5110.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-officejet_5110v.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5200_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5500_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_5600_series.ppd.gz
@@ -878,7 +857,6 @@ share/foomatic/db/source/PPD/HP/hp-officejet_6700.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_6800.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_6950.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_6960.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-officejet_7000_e809a.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_7000_e809a_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_7100_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_7110_series.ppd.gz
@@ -890,6 +868,7 @@ share/foomatic/db/source/PPD/HP/hp-officejet_7510_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_7610_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_8040_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_8700.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-officejet_9010_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_9100_series-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_color_mfp_x585.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_color_x555-ps.ppd.gz
@@ -949,6 +928,8 @@ share/foomatic/db/source/PPD/HP/hp-officejet_pro_8720.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_8730-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_8732-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_8740-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-officejet_pro_9010_series.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-officejet_pro_9020_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_k5300.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_k5400.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-officejet_pro_k550.ppd.gz
@@ -1052,10 +1033,8 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_5510d_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_5520_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_6510_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_6520_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-photosmart_7150.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_7200_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_7345.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-photosmart_7350.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_7400_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_7510_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_7520_series.ppd.gz
@@ -1083,7 +1062,6 @@ share/foomatic/db/source/PPD/HP/hp-photosmart_a640_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a710_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_a820_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_b010_series.ppd.gz
-share/foomatic/db/source/PPD/HP/hp-photosmart_b109a-m.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_b109a_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_b110_series.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-photosmart_b8500_series.ppd.gz