diff --git a/backend/mustek.conf b/backend/mustek.conf
index 7baebb08d..0fdbe9b0e 100644
--- a/backend/mustek.conf
+++ b/backend/mustek.conf
@@ -1,29 +1,30 @@
 # See sane-mustek(5) for documentation.
 
 #--------------------------- Global options ---------------------------------
-option strip-height 1           # some SCSI adapters need this; scanning may 
-                                # be faster without this option
-#option force-wait              # wait for scanner to be ready (only necessary
-                                # when scanner freezes)
+#option strip-height 1           # some SCSI adapters need this; scanning may 
+                                 # be faster without this option
+#option force-wait               # wait for scanner to be ready (only necessary
+                                 # when scanner freezes)
+#option disable-double-buffering # try this if you have SCSI trouble
 
 #-------------------------- SCSI scanners -----------------------------------
 scsi MUSTEK * Scanner
-# option linedistance-fix       # stripes may go away in color mode
-# option buffersize 1024        # set non standard buffer size (in kb)
-# option blocksize 2048         # set non standard block size (in kb)
-  option lineart-fix		# lineart may be faster with this option off.
+# option linedistance-fix        # stripes may go away in color mode
+# option buffersize 1024         # set non standard buffer size (in kb)
+# option blocksize 2048          # set non standard block size (in kb)
+# option lineart-fix		 # lineart may be faster with this option off.
 
 scsi SCANNER
-# option linedistance-fix       # stripes may go away in color mode
-# option buffersize 1024        # set non standard buffer size (in kb)
-# option blocksize 2048         # set non standard block size (in kb)
-  option lineart-fix		# lineart may be faster with this option off.
+# option linedistance-fix        # stripes may go away in color mode
+# option buffersize 1024         # set non standard buffer size (in kb)
+# option blocksize 2048          # set non standard block size (in kb)
+# option lineart-fix		 # lineart may be faster with this option off.
 
 /dev/scanner
-# option linedistance-fix       # stripes may go away in color mode
-# option buffersize 1024        # set non standard buffer size (in kb)
-# option blocksize 2048         # set non standard block size (in kb)
-  option lineart-fix		# lineart may be faster with this option off.
+# option linedistance-fix        # stripes may go away in color mode
+# option buffersize 1024         # set non standard buffer size (in kb)
+# option blocksize 2048          # set non standard block size (in kb)
+# option lineart-fix		 # lineart may be faster with this option off.
 
 #-------------------------- 600 II N ----------------------------------------
 #0x2eb
diff --git a/backend/mustek.desc b/backend/mustek.desc
index 51d0813de..ad5958e2c 100644
--- a/backend/mustek.desc
+++ b/backend/mustek.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "mustek"		; name of backend
-:version "1.0-107"		; version of backend
+:version "1.0-108"		; version of backend
 :status :stable			; :alpha, :beta, :stable, :new
 :manpage "sane-mustek"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/"
diff --git a/doc/sane-mustek.man b/doc/sane-mustek.man
index c4d371c59..98711f550 100644
--- a/doc/sane-mustek.man
+++ b/doc/sane-mustek.man
@@ -1,4 +1,4 @@
-.TH sane-mustek 5 "10 Jun 2001"
+.TH sane-mustek 5 "7 Jul 2001"
 .IX sane-mustek
 .SH NAME
 sane-mustek - SANE backend for Mustek flatbed scanners
@@ -118,10 +118,11 @@ device name.
 The supported options are
 .BR linedistance-fix ,
 .BR lineart-fix ,
-.BR legal-size
+.BR legal-size ,
 .BR buffersize ,
 .BR blocksize ,
 .BR strip-height ,
+.BR disable-double-buffering ,
 and
 .B force-wait
 
@@ -176,12 +177,15 @@ single SCSI read command.  The height is specified in inches and may contain a
 fractional part (e.g., 1.5).  Setting the strip-height to a small value (one
 inch, for example) reduces the likelihood of encountering problems with SCSI
 driver timeouts and/or timeouts with other devices on the same SCSI bus.
-Unfortunately, it also increases scan times.  Thus, if the scanner is the only
-device on the SCSI bus it is connected to and if it is known that the SCSI
-driver does not suffer from premature timeouts, it is recommended to increase
-the strip-height or remove the option completely, which corresponds to an
-infinite strip height.  See sane-scsi(5) on how to avoid problems with SCSI
-timeouts.
+Unfortunately, it also increases scan times. With current SCSI adapters and
+drivers this option shouldn't be needed any more.
+
+Option
+.B disable-double-buffering
+is a global option. If set, the backend will only send one buffer at a time to
+the scanner. Try this option if you have trouble while scanning, e.g. SCSI
+errors, freezes, or the first few cm are repeated over and over again in your
+image.
 
 Finally,
 .B force-wait