diff --git a/ChangeLog b/ChangeLog
index e49329d20..08938bb5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2008-03-02  Stéphane Voltz <stef.dev@free.fr>
+2008-03-28  m. allan noah <kitno455 a t gmail d o t com>
+	* sanei/sanei_usb.c: add usb class 6 (imaging) to detected devices
+	* sanei/sanei_scsi.c: fix bug in sanei_scsi_find_devices() which
+	  caused early return if attach callback returned error.
+
+2008-03-22  Stéphane Voltz <stef.dev@free.fr>
 	* AUTHORS configure configure.in backend/dll.conf.in
 	  backend/Makefile.in backend/rts8891.c backend/rts8891.conf.in
 	  backend/rts8891_devices.c backend/rts8891.h backend/rts8891_low.c
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index b61cba984..2546dfba1 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -2882,8 +2882,7 @@ issue (struct req *req)
 				   channel, id, lun)
 		&& ((*attach) (dev_name) != SANE_STATUS_GOOD))
 	      {
-		fclose (proc_fp);
-		return;
+		DBG(1,"sanei_scsi_find_devices: bad attach\n");
 	      }
 	  }
 	vendor[0] = model[0] = type[0] = 0;
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
index 0106a3a57..1f882c1cb 100644
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@@ -476,6 +476,7 @@ sanei_usb_init (void)
 		    {
 		    case USB_CLASS_VENDOR_SPEC:
 		    case USB_CLASS_PER_INTERFACE:
+		    case 6:	/* imaging? */
 		    case 16:	/* data? */
 		      found = SANE_TRUE;
 		      break;