diff --git a/cups-usblp-quirks.patch b/cups-usblp-quirks.patch
index 135f939..506564c 100644
--- a/cups-usblp-quirks.patch
+++ b/cups-usblp-quirks.patch
@@ -1,6 +1,6 @@
 diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-libusb.c
 --- cups-1.5.4/backend/usb-libusb.c.usblp-quirks	2012-07-16 19:16:46.000000000 +0200
-+++ cups-1.5.4/backend/usb-libusb.c	2012-08-23 13:37:28.309013482 +0200
++++ cups-1.5.4/backend/usb-libusb.c	2012-10-17 16:30:58.571793169 +0200
 @@ -70,7 +70,7 @@ typedef struct usb_printer_s		/**** USB
  			read_endp,	/* Read endpoint */
  			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
@@ -19,7 +19,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
  					   the usblp kernel module */
  
-@@ -141,15 +143,21 @@ static const struct quirk_printer_struct
+@@ -141,15 +143,43 @@ static const struct quirk_printer_struct
  	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
  	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
  						  by zut <kernel@zut.de> */
@@ -27,22 +27,46 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
 +			    Printer, http://www.cups.org/str.php?L4155 */
 +	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
 +			    Printer, https://bugs.launchpad.net/bugs/1032385 */
++	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
++			    Printer, https://bugs.launchpad.net/bugs/1032456 */
++	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
++			    Printer, https://bugs.launchpad.net/bugs/1050009 */
++	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
++			    Printer, http://www.cups.org/str.php?L4155 */
++	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
++			    Printer, http://www.cups.org/str.php?L4155 */
++	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
++						  HL-1430 Laser Printer,
++				     https://bugs.launchpad.net/bugs/1038695 */
  	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
  			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1440 Laser Printer */
+-						  HL-1440 Laser Printer */
++						  HL-1440 Laser Printer,
++				     https://bugs.launchpad.net/bugs/1000253 */
++	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
++						  Okipage 14ex Printer,
++				     https://bugs.launchpad.net/bugs/872483 */
++	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
++				     https://bugs.launchpad.net/bugs/872483 */
  	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
  						      Printer M129C */
  	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
 -			  USBLP_QUIRK_NO_REATTACH },
 +			  USBLP_QUIRK_NO_REATTACH |
 +	                  USBLP_QUIRK_RESET },
++	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
++			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
  	/* Prolific Technology, Inc. PL2305 Parallel Port
- 	   (USB -> Parallel adapter) */
-+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
+-	   (USB -> Parallel adapter) */
++	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
++	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
++				     https://bugs.launchpad.net/bugs/1032456 */
++	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
++				     https://bugs.launchpad.net/bugs/1001028 */
  	{ 0, 0 }
  };
  
-@@ -256,7 +264,12 @@ print_device(const char *uri,		/* I - De
+@@ -256,7 +286,12 @@ print_device(const char *uri,		/* I - De
    }
  
    g.print_fd = print_fd;
@@ -56,7 +80,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  
   /*
    * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +786,7 @@ close_device(usb_printer_t *printer)	/*
+@@ -772,7 +807,7 @@ close_device(usb_printer_t *printer)	/*
      * Reset the device to clean up after the job
      */
  
@@ -65,7 +89,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
      {
        if ((errcode = libusb_reset_device(printer->handle)) < 0)
  	fprintf(stderr,
-@@ -1288,7 +1302,7 @@ open_device(usb_printer_t *printer,	/* I
+@@ -1288,7 +1323,7 @@ open_device(usb_printer_t *printer,	/* I
    }
  
    printer->usblp_attached = 0;
@@ -74,7 +98,7 @@ diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-lib
  
    if (verbose)
      fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1600,8 @@ static unsigned int quirks(int vendor, i
+@@ -1586,7 +1621,8 @@ static unsigned int quirks(int vendor, i
    for (i = 0; quirk_printers[i].vendorId; i++)
    {
      if (vendor == quirk_printers[i].vendorId &&
diff --git a/cups.spec b/cups.spec
index 9ce3156..da5a758 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -235,7 +235,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch23 -p1 -b .str3382
 # Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job.
 # This patch adds a quirk handler for this reset so that it will not be done for all printers.
-#(bug #847923, STR #4155)
+# (bug #847923, STR #4155, STR #4191)
+# bug #867392
 %patch24 -p1 -b .usblp-quirks
 # Use mode 0755 for binaries and libraries where appropriate.
 %patch25 -p1 -b .0755
@@ -578,6 +579,10 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Mon Oct 22 2012 Jiri Popelka <jpopelka@redhat.com> 1:1.6.1-6
+- Add quirk rule for Xerox Phaser 3124 (#867392)
+- backport more quirk rules (STR #4191)
+
 * Thu Sep 20 2012 Tim Waugh <twaugh@redhat.com> 1:1.6.1-5
 - The cups-libs subpackage contains code distributed under the zlib
   license (md5.c).