diff --git a/ChangeLog b/ChangeLog
index 6380fc3ac..1205a4bb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-09  m. allan noah <anoah AT pfeiffer DOT edu>
+
+	* frontend/scanimage.c: move sane_cancel() out of scan_it().
+	  more like scanadf. fixes issues with duplex adf scanning.
+
 2006-06-08  Wittawat Yamwong <wittawat@web.de>
 
 	* backend/pixma.h: Upgraded to version 0.11.3
diff --git a/frontend/scanimage.c b/frontend/scanimage.c
index b96e165a2..bb817272d 100644
--- a/frontend/scanimage.c
+++ b/frontend/scanimage.c
@@ -1409,7 +1409,6 @@ scan_it (void)
     }
 
 cleanup:
-  sane_cancel (device);
   if (image.data)
     free (image.data);
 
@@ -2182,6 +2181,8 @@ List of available devices:", prog_name);
       while ((batch
 	      && (batch_count == BATCH_COUNT_UNLIMITED || --batch_count))
 	     && SANE_STATUS_GOOD == status);
+
+      sane_cancel (device);
     }
   else
     status = test_it ();