diff --git a/.gitignore b/.gitignore
index b35bdcb..fd8d283 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.20.3.tar.gz
 /hplip-3.20.5.tar.gz
 /hplip-3.20.6.tar.gz
+/hplip-3.20.9.tar.gz
diff --git a/hplip-3.18.6.tar.gz.asc b/hplip-3.18.6.tar.gz.asc
deleted file mode 100644
index 8221531..0000000
--- a/hplip-3.18.6.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlsYzCYACgkQc9dwzaWQR7k3kQCgpUG6Okb3nGf7qodmI9zTBf3A
-a8AAoLD0LiwifYlnEBlHS5Eaw/ylB9A8
-=H/1x
------END PGP SIGNATURE-----
diff --git a/hplip-3.20.9.tar.gz.asc b/hplip-3.20.9.tar.gz.asc
new file mode 100644
index 0000000..244c435
--- /dev/null
+++ b/hplip-3.20.9.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAl9q3H0ACgkQc9dwzaWQR7mXYwCg29C1KMe4i4oKiGBuTORPyFFD
+DBIAoNsiIA+A17b4QeR4GCbRhWBEYvl5
+=OKLE
+-----END PGP SIGNATURE-----
diff --git a/hplip-configure-python.patch b/hplip-configure-python.patch
index 0f6b713..9dc78cd 100644
--- a/hplip-configure-python.patch
+++ b/hplip-configure-python.patch
@@ -1,8 +1,7 @@
-diff --git a/configure.in b/configure.in
-index 9e330e3..e4a254e 100755
---- a/configure.in
-+++ b/configure.in
-@@ -604,20 +604,31 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu
+diff -up hplip-3.20.9/configure.in.configure-python hplip-3.20.9/configure.in
+--- hplip-3.20.9/configure.in.configure-python	2020-09-23 07:24:27.000000000 +0200
++++ hplip-3.20.9/configure.in	2020-10-02 07:27:09.082331431 +0200
+@@ -604,17 +604,29 @@ if test "$class_driver" = "no" && test "
     fi
  fi
  
@@ -42,11 +41,8 @@ index 9e330e3..e4a254e 100755
 +  LIBS="$SAVE_LIBS"
  fi
  
--#CFLAGS=`(python-config --includes)`
- if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then
-    AC_ARG_VAR([PYTHON], [Python interpreter/compiler command])
-    AM_PATH_PYTHON([2.2])
-@@ -630,7 +641,6 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite
+ #CFLAGS=`(python-config --includes)`
+@@ -631,7 +643,6 @@ if test "$class_driver" = "no" && test "
     AS_IF([test "x$FOUND_HEADER" != "xyes"],
            [AC_MSG_ERROR([cannot find python-devel support], 6)])
  fi
diff --git a/hplip-covscan.patch b/hplip-covscan.patch
index 3ce9af1..bb6314b 100644
--- a/hplip-covscan.patch
+++ b/hplip-covscan.patch
@@ -233,21 +233,6 @@ index 5879a70..d246041 100644
      hpwrite(buffer, strlen(buffer));
      fprintf(stderr, "HP PS filter func = WriteHeader           : WRITING PJL HEADER INFO\n");
      return;
-diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c
-index abca295..8dd6fa5 100644
---- a/protocol/discovery/mdns.c
-+++ b/protocol/discovery/mdns.c
-@@ -31,6 +31,10 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stdio.h>
-+#include <stdlib.h>
- #include "mdns.h"
- 
- /* Convert "www.google.com" to "3www6google3com". */
 diff --git a/protocol/hp_ipp.h b/protocol/hp_ipp.h
 index 3853f84..de76202 100644
 --- a/protocol/hp_ipp.h
@@ -310,18 +295,6 @@ index af45bff..4f59b21 100644
      return;
    }
  
-diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
-index ae34cfb..ffde2ad 100644
---- a/scan/sane/hpaio.c
-+++ b/scan/sane/hpaio.c
-@@ -41,6 +41,7 @@
- #include "soap.h"
- #include "soapht.h"
- #include "marvell.h"
-+#include "mdns.h"
- #include "hpaio.h"
- #include "ledm.h"
- #include "sclpml.h"
 diff --git a/scan/sane/http.c b/scan/sane/http.c
 index 800df91..45668cd 100644
 --- a/scan/sane/http.c
diff --git a/hplip-revert-plugins.patch b/hplip-revert-plugins.patch
index bc54c15..823fb14 100644
--- a/hplip-revert-plugins.patch
+++ b/hplip-revert-plugins.patch
@@ -1,8 +1,7 @@
-diff --git a/data/models/models.dat b/data/models/models.dat
-index 85485636e..3a430e250 100644
---- a/data/models/models.dat
-+++ b/data/models/models.dat
-@@ -2131,7 +2131,7 @@ ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
+diff -up hplip-3.20.9/data/models/models.dat.revert-plugins hplip-3.20.9/data/models/models.dat
+--- hplip-3.20.9/data/models/models.dat.revert-plugins	2020-10-02 07:44:26.873416731 +0200
++++ hplip-3.20.9/data/models/models.dat	2020-10-02 08:49:32.418280169 +0200
+@@ -2123,7 +2123,7 @@ ppd-name=hp-laserjet_100_color_mfp_m175-
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -11,7 +10,133 @@ index 85485636e..3a430e250 100644
  plugin-reason=64
  power-settings=0
  pq-diag-type=0
-@@ -3913,8 +3913,8 @@ model1=HP LaserJet Pro 200 color MFP M276nw
+@@ -3373,7 +3373,7 @@ model1=HP LaserJet Pro MFP M125r
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3416,7 +3416,7 @@ model1=HP LaserJet Pro MFP M125s
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3459,7 +3459,7 @@ model1=HP LaserJet Pro MFP M125a
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3502,7 +3502,7 @@ model1=HP LaserJet Pro MFP M125nw
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3545,7 +3545,7 @@ model1=HP LaserJet Pro MFP M125rnw
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3588,7 +3588,7 @@ model1=HP LaserJet Pro MFP M125nr
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3631,7 +3631,7 @@ model1=HP LaserJet Pro MFP M126a
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3674,7 +3674,7 @@ model1=HP LaserJet Pro MFP M126nw
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3717,7 +3717,7 @@ model1=HP LaserJet Pro MFP M127fp
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3760,7 +3760,7 @@ model1=HP LaserJet Pro MFP M127fn
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3846,7 +3846,7 @@ model1=HP LaserJet Pro MFP M128fn
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3889,7 +3889,7 @@ model1=HP LaserJet Pro MFP M128fp
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -3932,7 +3932,7 @@ model1=HP LaserJet Pro MFP M128fw
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -4225,7 +4225,7 @@ model1=HP Color LaserJet Pro MPF M177fw
+ monitor-type=0
+ panel-check-type=0
+ pcard-type=0
+-plugin=0
++plugin=1
+ plugin-reason=65
+ power-settings=0
+ pq-diag-type=0
+@@ -4277,8 +4277,8 @@ model1=HP LaserJet Pro 200 color MFP M27
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -22,7 +147,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -3967,8 +3967,8 @@ model1=HP LaserJet 200 Color MFP M275s
+@@ -4331,8 +4331,8 @@ model1=HP LaserJet 200 Color MFP M275s
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -33,7 +158,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4021,8 +4021,8 @@ model1=HP LaserJet 200 Color MFP M275u
+@@ -4385,8 +4385,8 @@ model1=HP LaserJet 200 Color MFP M275u
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -44,7 +169,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4075,8 +4075,8 @@ model1=HP LaserJet 200 Color MFP M275t
+@@ -4439,8 +4439,8 @@ model1=HP LaserJet 200 Color MFP M275t
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -55,7 +180,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4128,8 +4128,8 @@ linefeed-cal-type=0
+@@ -4492,8 +4492,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -66,7 +191,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4181,8 +4181,8 @@ linefeed-cal-type=0
+@@ -4545,8 +4545,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -77,7 +202,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4234,8 +4234,8 @@ linefeed-cal-type=0
+@@ -4598,8 +4598,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -88,7 +213,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4288,8 +4288,8 @@ model1=HP LaserJet Pro 200 color MFP M276n
+@@ -4652,8 +4652,8 @@ model1=HP LaserJet Pro 200 color MFP M27
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -99,7 +224,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4341,8 +4341,8 @@ linefeed-cal-type=0
+@@ -4705,8 +4705,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -110,7 +235,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4394,8 +4394,8 @@ linefeed-cal-type=0
+@@ -4758,8 +4758,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -121,7 +246,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4447,8 +4447,8 @@ linefeed-cal-type=0
+@@ -4811,8 +4811,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -132,7 +257,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4500,8 +4500,8 @@ linefeed-cal-type=0
+@@ -4864,8 +4864,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -143,7 +268,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4553,8 +4553,8 @@ linefeed-cal-type=0
+@@ -4917,8 +4917,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -154,7 +279,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4606,8 +4606,8 @@ linefeed-cal-type=0
+@@ -4970,8 +4970,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -165,7 +290,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4659,8 +4659,8 @@ linefeed-cal-type=0
+@@ -5023,8 +5023,8 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -176,7 +301,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4713,8 +4713,8 @@ model1=HP LaserJet 200 Color MFP M275nw
+@@ -5077,8 +5077,8 @@ model1=HP LaserJet 200 Color MFP M275nw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -187,7 +312,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -5850,7 +5850,7 @@ model1=HP LaserJet Pro MFP M225rdn
+@@ -6214,7 +6214,7 @@ model1=HP LaserJet Pro MFP M225rdn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -196,7 +321,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=2112
  power-settings=0
  ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5893,7 +5893,7 @@ model1=HP LaserJet Pro MFP M225dw
+@@ -6257,7 +6257,7 @@ model1=HP LaserJet Pro MFP M225dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -205,7 +330,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=2112
  power-settings=0
  ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5934,7 +5934,7 @@ model1=HP LaserJet Pro MFP M225dn
+@@ -6298,7 +6298,7 @@ model1=HP LaserJet Pro MFP M225dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -214,7 +339,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=2112
  power-settings=0
  ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5975,7 +5975,7 @@ model1=HP LaserJet Pro MFP M226dw
+@@ -6339,7 +6339,7 @@ model1=HP LaserJet Pro MFP M226dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -223,7 +348,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=2112
  power-settings=0
  ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -6017,7 +6017,7 @@ model1=HP LaserJet Pro MFP M226dn
+@@ -6381,7 +6381,7 @@ model1=HP LaserJet Pro MFP M226dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -232,7 +357,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=2112
  power-settings=0
  ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -6466,8 +6466,8 @@ model1=HP LaserJet 300 Color MFP M375nw
+@@ -6830,8 +6830,8 @@ model1=HP LaserJet 300 Color MFP M375nw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -243,7 +368,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -7863,8 +7863,8 @@ model1=HP LaserJet 400 Color MFP M475dw
+@@ -8227,8 +8227,8 @@ model1=HP LaserJet 400 Color MFP M475dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -254,7 +379,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8007,8 +8007,8 @@ model1=HP LaserJet 400 MFP M425dw
+@@ -8371,8 +8371,8 @@ model1=HP LaserJet 400 MFP M425dw
  monitor-type=1
  panel-check-type=0
  pcard-type=0
@@ -265,7 +390,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_400_mfp_m425-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8052,8 +8052,8 @@ model1=HP Laserjet 400 MFP M425dn
+@@ -8416,8 +8416,8 @@ model1=HP Laserjet 400 MFP M425dn
  monitor-type=1
  panel-check-type=0
  pcard-type=0
@@ -276,7 +401,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_400_mfp_m425-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8440,8 +8440,8 @@ model1=HP LaserJet 400 Color MFP M475dn
+@@ -8804,8 +8804,8 @@ model1=HP LaserJet 400 Color MFP M475dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -287,7 +412,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8751,8 +8751,8 @@ model1=HP LaserJet Pro MFP M435nw
+@@ -9115,8 +9115,8 @@ model1=HP LaserJet Pro MFP M435nw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -298,7 +423,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  pq-diag-type=0
  r-type=0
-@@ -9374,8 +9374,8 @@ model1=HP Color Laserjet Pro MFP M476dw
+@@ -9738,8 +9738,8 @@ model1=HP Color Laserjet Pro MFP M476dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -309,7 +434,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9416,8 +9416,8 @@ model1=HP Color Laserjet Pro MFP M476nw
+@@ -9780,8 +9780,8 @@ model1=HP Color Laserjet Pro MFP M476nw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -320,7 +445,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9458,8 +9458,8 @@ model1=HP Color Laserjet Pro MFP M476dn
+@@ -9822,8 +9822,8 @@ model1=HP Color Laserjet Pro MFP M476dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -331,7 +456,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9754,8 +9754,8 @@ model1=HP LaserJet Pro 500 color MFP M570dw
+@@ -10118,8 +10118,8 @@ model1=HP LaserJet Pro 500 color MFP M57
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -342,7 +467,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9808,8 +9808,8 @@ model1=HP LaserJet Pro 500 color MFP M570dn
+@@ -10172,8 +10172,8 @@ model1=HP LaserJet Pro 500 color MFP M57
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -353,7 +478,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -10383,8 +10383,8 @@ model1=HP LaserJet Pro M521dn Multifunction Printer
+@@ -10747,8 +10747,8 @@ model1=HP LaserJet Pro M521dn Multifunct
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -364,7 +489,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_mfp_m521-ps.ppd
  family-ppd=hp-postscript-laserjet.ppd
-@@ -10428,8 +10428,8 @@ model1=HP LaserJet Pro M521dw Multifunction Printer
+@@ -10792,8 +10792,8 @@ model1=HP LaserJet Pro M521dw Multifunct
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -375,70 +500,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_mfp_m521-ps.ppd
  family-ppd=hp-postscript-laserjet.ppd
-@@ -16911,7 +16911,7 @@ model1=HP LaserJet 1000 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17091,7 +17091,7 @@ model1=HP LaserJet 1005 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17131,7 +17131,7 @@ model1=HP LaserJet P1005 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17174,7 +17174,7 @@ model1=HP LaserJet M1005 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -17217,7 +17217,7 @@ model1=HP LaserJet P1006 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17260,7 +17260,7 @@ model1=HP LaserJet P1007 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17303,7 +17303,7 @@ model1=HP LaserJet P1008 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17346,7 +17346,7 @@ model1=HP LaserJet P1009 Printer
+@@ -18353,7 +18353,7 @@ model1=HP LaserJet Pro CP1025 Color Prin
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -447,29 +509,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -17563,8 +17563,8 @@ model1=HP Color LaserJet CM1015 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -17615,8 +17615,8 @@ model1=HP Color LaserJet CM1017 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -17668,7 +17668,7 @@ model2=HP LaserJet 1018s Printer
+@@ -18989,7 +18989,7 @@ model1=HP LaserJet Professional P 1102w
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -478,7 +518,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -17712,7 +17712,7 @@ model2=HP LaserJet 1020 Plus Printer
+@@ -19032,7 +19032,7 @@ model1=HP Laserjet Professional P1106w P
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -487,7 +527,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -17885,7 +17885,7 @@ model1=HP LaserJet Pro CP1025nw Color Printer Series
+@@ -19075,7 +19075,7 @@ model1=HP Laserjet Professional P1106 Pr
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -496,7 +536,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -17937,7 +17937,7 @@ model1=HP LaserJet Pro CP1025 Color Printer Series
+@@ -19118,7 +19118,7 @@ model1=HP LaserJet Professional P1107 Pr
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -505,7 +545,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18487,7 +18487,7 @@ model2=HP Laserjet Professional P1102s Printer
+@@ -19161,7 +19161,7 @@ model1=HP LaserJet Professional P1107w P
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -514,7 +554,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18530,7 +18530,7 @@ model1=HP LaserJet Professional P 1102w Printer
+@@ -19204,7 +19204,7 @@ model1=HP Laserjet Professional P1108w P
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -523,7 +563,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18573,7 +18573,7 @@ model1=HP Laserjet Professional P1106w Printer
+@@ -19247,7 +19247,7 @@ model1=HP Laserjet Professional P1108 Pr
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -532,7 +572,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18616,7 +18616,7 @@ model1=HP Laserjet Professional P1106 Printer
+@@ -19290,7 +19290,7 @@ model1=HP LaserJet Professional P1109w P
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -541,7 +581,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18659,7 +18659,7 @@ model1=HP LaserJet Professional P1107 Printer
+@@ -19333,7 +19333,7 @@ model1=HP LaserJet Professional P1109 Pr
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -550,61 +590,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -18702,7 +18702,7 @@ model1=HP LaserJet Professional P1107w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18745,7 +18745,7 @@ model1=HP Laserjet Professional P1108w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18788,7 +18788,7 @@ model1=HP Laserjet Professional P1108 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18831,7 +18831,7 @@ model1=HP LaserJet Professional P1109w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18874,7 +18874,7 @@ model1=HP LaserJet Professional P1109 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -19091,7 +19091,7 @@ model1=HP LaserJet M1120 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19134,7 +19134,7 @@ model1=HP LaserJet M1120n Multifunction Printer
+@@ -19683,7 +19683,7 @@ model2=HP LaserJet Professional M1132s M
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -613,7 +599,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19224,7 +19224,7 @@ model2=HP LaserJet Professional M1132s Multifunction Printer
+@@ -19726,7 +19726,7 @@ model1=HP Laserjet Professional M1136 Mu
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -622,7 +608,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19267,7 +19267,7 @@ model1=HP Laserjet Professional M1136 Multifunction Printer
+@@ -19769,7 +19769,7 @@ model1=HP LaserJet Professional M1137 Mu
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -631,7 +617,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19310,7 +19310,7 @@ model1=HP LaserJet Professional M1137 Multifunction Printer
+@@ -19812,7 +19812,7 @@ model1=HP LaserJet Professional M1138 Mu
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -640,7 +626,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19353,7 +19353,7 @@ model1=HP LaserJet Professional M1138 Multifunction Printer
+@@ -19855,7 +19855,7 @@ model1=HP LaserJet Professional M1139 Mu
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -649,7 +635,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19396,7 +19396,7 @@ model1=HP LaserJet Professional M1139 Multifunction Printer
+@@ -20447,7 +20447,7 @@ model1=HP LaserJet Professional M1212nf
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -658,7 +644,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -19988,7 +19988,7 @@ model1=HP LaserJet Professional M1212nf Multifunction Printer
+@@ -20490,7 +20490,7 @@ model1=HP LaserJet Professional M1213nf
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -667,7 +653,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20031,7 +20031,7 @@ model1=HP LaserJet Professional M1213nf Multifunction Printer
+@@ -20533,7 +20533,7 @@ model1=HP LaserJet Professional M1214nfh
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -676,7 +662,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20074,7 +20074,7 @@ model1=HP LaserJet Professional M1214nfh Multifunction Printer
+@@ -20675,7 +20675,7 @@ model1=HP LaserJet Professional M1216nfh
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -685,7 +671,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20117,7 +20117,7 @@ model1=HP Color LaserJet CP1215 Printer
+@@ -20718,7 +20718,7 @@ model1=HP Color LaserJet CP1217 Printer
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -694,7 +680,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -20216,7 +20216,7 @@ model1=HP LaserJet Professional M1216nfh MFP
+@@ -20813,7 +20813,7 @@ model1=HP Laserjet M1210 MFP Series
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -703,16 +689,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20259,7 +20259,7 @@ model1=HP Color LaserJet CP1217 Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -20311,7 +20311,7 @@ model1=HP LaserJet Professional M1217nfW Multifunction Printer
+@@ -20903,7 +20903,7 @@ model1=HP HotSpot LaserJet Pro M1218nfs
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -721,7 +698,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20354,7 +20354,7 @@ model1=HP Laserjet M1210 MFP Series
+@@ -20945,7 +20945,7 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -730,7 +707,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20444,7 +20444,7 @@ model1=HP HotSpot LaserJet Pro M1218nfs MFP
+@@ -20987,7 +20987,7 @@ linefeed-cal-type=0
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -739,56 +716,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -20486,7 +20486,7 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20528,7 +20528,7 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20571,7 +20571,7 @@ model1=HP LaserJet Professional M1219nf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -21235,8 +21235,8 @@ model1=HP Color LaserJet CM1312nfi Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -21287,8 +21287,8 @@ model1=HP Color LaserJet CM1312 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -21385,7 +21385,7 @@ model1=HP LaserJet M1319f Multifunction Printer
+@@ -21030,7 +21030,7 @@ model1=HP LaserJet Professional M1219nf
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -797,7 +725,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=65
  power-settings=0
  pq-diag-type=0
-@@ -21861,8 +21861,8 @@ model1=HP LaserJet Professional CM1411fn
+@@ -22320,8 +22320,8 @@ model1=HP LaserJet Professional CM1411fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -808,7 +736,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -21914,8 +21914,8 @@ model1=HP LaserJet Professional CM1412fn
+@@ -22373,8 +22373,8 @@ model1=HP LaserJet Professional CM1412fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -819,7 +747,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -21967,8 +21967,8 @@ model1=HP LaserJet Professional CM1413fn
+@@ -22426,8 +22426,8 @@ model1=HP LaserJet Professional CM1413fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -830,7 +758,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22020,8 +22020,8 @@ model1=HP LaserJet Professional CM1415fn
+@@ -22479,8 +22479,8 @@ model1=HP LaserJet Professional CM1415fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -841,7 +769,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22073,8 +22073,8 @@ model1=HP LaserJet Professional CM1415fnw
+@@ -22532,8 +22532,8 @@ model1=HP LaserJet Professional CM1415fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -852,7 +780,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22126,8 +22126,8 @@ model1=HP LaserJet Professional CM1416fnw
+@@ -22585,8 +22585,8 @@ model1=HP LaserJet Professional CM1416fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -863,7 +791,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22179,8 +22179,8 @@ model1=HP LaserJet Professional CM1417fnw
+@@ -22638,8 +22638,8 @@ model1=HP LaserJet Professional CM1417fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -874,7 +802,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22232,8 +22232,8 @@ model1=HP LaserJet Professional CM1418fnw
+@@ -22691,8 +22691,8 @@ model1=HP LaserJet Professional CM1418fn
  monitor-type=0
  panel-check-type=1
  pcard-type=0
@@ -885,49 +813,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_cm1410_series-ps.ppd
  pq-diag-type=0
-@@ -22619,7 +22619,7 @@ model1=HP LaserJet P1505 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -22921,8 +22921,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23019,8 +23019,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23063,8 +23063,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23430,8 +23430,8 @@ model1=HP LaserJet M1536dnf MFP
+@@ -23889,8 +23889,8 @@ model1=HP LaserJet M1536dnf MFP
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -938,7 +824,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
  family-ppd=hp-postscript-laserjet.ppd
-@@ -23475,8 +23475,8 @@ model1=HP LaserJet M1537dnf MFP
+@@ -23934,8 +23934,8 @@ model1=HP LaserJet M1537dnf MFP
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -949,7 +835,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
  pq-diag-type=0
-@@ -23519,8 +23519,8 @@ model1=HP LaserJet M1538dnf MFP
+@@ -23978,8 +23978,8 @@ model1=HP LaserJet M1538dnf MFP
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -960,7 +846,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
  pq-diag-type=0
-@@ -23563,8 +23563,8 @@ model1=HP LaserJet M1539dnf MFP
+@@ -24022,8 +24022,8 @@ model1=HP LaserJet M1539dnf MFP
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -971,25 +857,7 @@ index 85485636e..3a430e250 100644
  power-settings=0
  ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
  pq-diag-type=0
-@@ -23607,7 +23607,7 @@ model1=HP LaserJet Professional P1566
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -23650,7 +23650,7 @@ model1=HP LaserJet Professional P1567
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -23693,7 +23693,7 @@ model1=HP LaserJet Professional P1568
+@@ -24109,7 +24109,7 @@ model1=HP LaserJet Professional P1567
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -998,7 +866,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -23736,7 +23736,7 @@ model1=HP LaserJet Professional P1569
+@@ -24152,7 +24152,7 @@ model1=HP LaserJet Professional P1568
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1007,7 +875,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -24132,7 +24132,7 @@ model1=HP Color LaserJet 1600 Printer
+@@ -24195,7 +24195,7 @@ model1=HP LaserJet Professional P1569
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1016,7 +884,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -24172,7 +24172,7 @@ model1=HP LaserJet Professional P1606dn Printer
+@@ -24631,7 +24631,7 @@ model1=HP LaserJet Professional P1606dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1025,7 +893,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -24215,7 +24215,7 @@ model1=HP LaserJet Professional P1607dn Printer
+@@ -24674,7 +24674,7 @@ model1=HP LaserJet Professional P1607dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1034,7 +902,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -24258,7 +24258,7 @@ model1=HP LaserJet Professional P1608dn Printer
+@@ -24717,7 +24717,7 @@ model1=HP LaserJet Professional P1608dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1043,7 +911,7 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -24301,7 +24301,7 @@ model1=HP LaserJet Professional P1609dn Printer
+@@ -24760,7 +24760,7 @@ model1=HP LaserJet Professional P1609dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1052,25 +920,29 @@ index 85485636e..3a430e250 100644
  plugin-reason=1
  power-settings=0
  pq-diag-type=0
-@@ -25254,7 +25254,7 @@ model1=HP LaserJet P2035n Printer
+@@ -29946,8 +29946,8 @@ ppd-name=hp-color_laserjet_2800-ps.ppd
  monitor-type=0
- panel-check-type=0
- pcard-type=0
+ panel-check-type=1
+ pcard-type=2
 -plugin=0
+-plugin-reason=0
 +plugin=1
- plugin-reason=1
++plugin-reason=64
  power-settings=0
  pq-diag-type=0
-@@ -25297,7 +25297,7 @@ model1=HP LaserJet P2035 Printer
+ r-type=0
+@@ -30068,8 +30068,8 @@ ppd-name=hp-color_laserjet_2820-ps.ppd
  monitor-type=0
- panel-check-type=0
- pcard-type=0
+ panel-check-type=1
+ pcard-type=2
 -plugin=0
+-plugin-reason=0
 +plugin=1
- plugin-reason=1
++plugin-reason=64
  power-settings=0
  pq-diag-type=0
-@@ -26939,8 +26939,8 @@ model1=HP Color LaserJet CM2320 Multifunction Printer
+ r-type=0
+@@ -53138,8 +53138,8 @@ model1=HP Color LaserJet MFP M277n
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1079,9 +951,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -26991,8 +26991,8 @@ model1=HP Color LaserJet CM2320nf Multifunction Printer
+ ppd-name=hp-color_laserjet_mfp_m277
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -53192,8 +53192,8 @@ model1=HP Color LaserJet MFP M277dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1090,9 +962,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -27043,8 +27043,8 @@ model1=HP Color LaserJet CM2320fxi Multifunction Printer
+ ppd-name=hp-color_laserjet_pro_mfp_m277
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -53933,8 +53933,8 @@ model1=HP Color LaserJet Pro MFP M274n
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1101,9 +973,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -27095,8 +27095,8 @@ model1=HP Color LaserJet CM2320n Multifunction Printer
+ ppd-name=hp-color_laserjet_mfp_m274-ps.ppd
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54716,8 +54716,8 @@ model1=HP Laserjet Pro MFP M426fdn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1112,18 +984,20 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -28453,7 +28453,7 @@ model1=HP Color LaserJet 2600n Printer
+ ppd-name=laserjet_mfp_m426_m427
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54761,8 +54761,8 @@ model1=HP Laserjet Pro MFP M426fdw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
 -plugin=0
+-plugin-reason=0
 +plugin=1
- plugin-reason=1
++plugin-reason=64
  power-settings=0
- pq-diag-type=0
-@@ -29353,8 +29353,8 @@ model1=HP LaserJet M2727 Multifunction Printer
+ ppd-name=laserjet_mfp_m426_m427
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54806,8 +54806,8 @@ model1=HP Laserjet Pro MFP M427dn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1132,9 +1006,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -29397,8 +29397,8 @@ model1=HP LaserJet M2727nfs Multifunction Printer
+ ppd-name=laserjet_mfp_m426_m427
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54851,8 +54851,8 @@ model1=HP Laserjet Pro MFP M427fdw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1143,9 +1017,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -29441,8 +29441,8 @@ model1=HP LaserJet M2727nf Multifunction Printer
+ ppd-name=laserjet_mfp_m426_m427
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54896,8 +54896,8 @@ model1=HP Laserjet Pro MFP M426dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1154,9 +1028,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- family-ppd=hp-postscript-laserjet.ppd
-@@ -52679,8 +52679,8 @@ model1=HP Color LaserJet MFP M277n
+ ppd-name=laserjet_mfp_m426_m427
+ family-ppd=hp-postscript-laserjet-pro.ppd
+@@ -54941,8 +54941,8 @@ model1=HP Laserjet Pro MFP M427dw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1165,9 +1039,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_mfp_m277
+ ppd-name=hp-laserjet_mfp_m426_m427-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -52733,8 +52733,8 @@ model1=HP Color LaserJet MFP M277dw
+@@ -55271,8 +55271,8 @@ model1=HP Color Laserjet Pro MFP M477 fn
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1176,9 +1050,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m277
+ ppd-name=hp-color_laserjet_pro_mfp_m477-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -53474,8 +53474,8 @@ model1=HP Color LaserJet Pro MFP M274n
+@@ -55313,8 +55313,8 @@ model1=HP Color Laserjet Pro MFP M477 fd
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1187,9 +1061,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_mfp_m274-ps.ppd
+ ppd-name=color_laserjet_pro_mfp_m477d
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54257,8 +54257,8 @@ model1=HP Laserjet Pro MFP M426fdn
+@@ -55355,8 +55355,8 @@ model1=HP Color Laserjet Pro MFP M477 fd
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1198,20 +1072,18 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=laserjet_mfp_m426_m427
+ ppd-name=hp-color_laserjet_pro_mfp_m477d-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54302,8 +54302,8 @@ model1=HP Laserjet Pro MFP M426fdw
+@@ -55437,7 +55437,7 @@ model1=HP LaserJet Pro MFP M127fs
  monitor-type=0
  panel-check-type=0
  pcard-type=0
 -plugin=0
--plugin-reason=0
 +plugin=1
-+plugin-reason=64
+ plugin-reason=65
  power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54347,8 +54347,8 @@ model1=HP Laserjet Pro MFP M427dn
+ pq-diag-type=0
+@@ -56513,8 +56513,8 @@ model1=HP Color Laserjet MFP M377 fnw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1220,9 +1092,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=laserjet_mfp_m426_m427
+ ppd-name=hp-color_laserjet_pro_mfp_m377-ps.ppd
  family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54392,8 +54392,8 @@ model1=HP Laserjet Pro MFP M427fdw
+@@ -57475,8 +57475,8 @@ model1=HP Color LaserJet MFP M277c6
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1231,42 +1103,36 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54437,8 +54437,8 @@ model1=HP Laserjet Pro MFP M426dw
+ ppd-name=hp-color_laserjet_pro_mfp_m277-ps.ppd
+ pq-diag-type=0
+@@ -60453,7 +60453,7 @@ model1=HP LaserJet Pro MFP M26a
  monitor-type=0
  panel-check-type=0
  pcard-type=0
 -plugin=0
--plugin-reason=0
 +plugin=1
-+plugin-reason=64
+ plugin-reason=1
  power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54482,8 +54482,8 @@ model1=HP Laserjet Pro MFP M427dw
+ pq-diag-type=0
+@@ -60493,7 +60493,7 @@ model1=HP LaserJet Pro MFP M26nw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
 -plugin=0
--plugin-reason=0
 +plugin=1
-+plugin-reason=64
+ plugin-reason=1
  power-settings=0
- ppd-name=hp-laserjet_mfp_m426_m427-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54812,8 +54812,8 @@ model1=HP Color Laserjet Pro MFP M477 fnw
+ pq-diag-type=0
+@@ -60653,7 +60653,7 @@ model1=HP LaserJet Pro MFP M27cnw
  monitor-type=0
  panel-check-type=0
  pcard-type=0
 -plugin=0
--plugin-reason=0
 +plugin=1
-+plugin-reason=64
+ plugin-reason=1
  power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m477-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54854,8 +54854,8 @@ model1=HP Color Laserjet Pro MFP M477 fdn
+ pq-diag-type=0
+@@ -65387,8 +65387,8 @@ model1=HP Smart Tank Plus 570 series
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1275,9 +1141,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=color_laserjet_pro_mfp_m477d
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54896,8 +54896,8 @@ model1=HP Color Laserjet Pro MFP M477 fdw
+ pq-diag-type=0
+ r-type=0
+@@ -67470,8 +67470,8 @@ model2=HP DeskJet Ink Advantage 2700 All
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1286,9 +1152,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m477d-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -56054,8 +56054,8 @@ model1=HP Color Laserjet MFP M377 fnw
+ pq-diag-type=0
+ r-type=0
+@@ -67510,8 +67510,8 @@ model1=HP DeskJet Plus 4100 All-in-One P
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1297,9 +1163,9 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m377-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -57016,8 +57016,8 @@ model1=HP Color LaserJet MFP M277c6
+ pq-diag-type=0
+ r-type=0
+@@ -67632,8 +67632,8 @@ model2=HP DeskJet Ink Advantage 2300 All
  monitor-type=0
  panel-check-type=0
  pcard-type=0
@@ -1308,5 +1174,5 @@ index 85485636e..3a430e250 100644
 +plugin=1
 +plugin-reason=64
  power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m277-ps.ppd
  pq-diag-type=0
+ r-type=0
diff --git a/hplip.spec b/hplip.spec
index a520d1f..f1c8cd4 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,8 +6,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.20.6
-Release: 13%{?dist}
+Version: 3.20.9
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -194,6 +194,8 @@ BuildRequires: gcc-c++
 
 BuildRequires: autoconf automake libtool
 BuildRequires: net-snmp-devel
+BuildRequires: pkgconfig(avahi-client)
+BuildRequires: pkgconfig(avahi-core)
 BuildRequires: cups-devel
 BuildRequires: python3-devel
 BuildRequires: libjpeg-devel
@@ -768,6 +770,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Fri Oct 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.9-1
+- 3.20.9
+
 * Wed Sep 30 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.6-13
 - fix bashisms in hplip-configure-python.patch
 - thanks for Daniel Pielmeier from Gentoo for review
diff --git a/sources b/sources
index cffcc78..9d25bc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hplip-3.20.6.tar.gz) = 6a5ce55465e3a537ecc0b6e7d198835dbe495e191522e674a507a4993e2061da3ea084a5239a74b2279c065c0775067d5b6a4aeb2a7791825106a299fb55e8f8
+SHA512 (hplip-3.20.9.tar.gz) = d2981cf51f6d893a576c51808710ac9815aa6ac5fdc617d95cc372518731a48b0aca09af721c1792e1531df6cf8fc0ebf5ebd7e9c96950602a830ceed3d441ae