diff -r -u sane-backends-1.0.15/backend/dll.conf ../sane-backends-1.0.15/backend/dll.conf
--- sane-backends-1.0.15/backend/dll.conf	2004-08-03 09:22:25.000000000 -0700
+++ ../sane-backends-1.0.15/backend/dll.conf	2005-01-16 15:01:23.000000000 -0800
@@ -46,6 +46,7 @@
 sceptre
 sharp
 sm3600
+sm3840
 snapscan
 sp15c
 #st400
diff -r -u sane-backends-1.0.15/backend/Makefile.in ../sane-backends-1.0.15/backend/Makefile.in
--- sane-backends-1.0.15/backend/Makefile.in	2004-10-10 05:43:42.000000000 -0700
+++ ../sane-backends-1.0.15/backend/Makefile.in	2005-01-16 14:48:24.000000000 -0800
@@ -150,7 +150,10 @@
   umax_pp_low.c umax_pp_low.h umax_pp_mid.c umax_pp_mid.h umax-scanner.c \
   umax-scanner.h umax-scsidef.h umax-uc1200s.c umax-uc1200se.c umax-uc1260.c \
   umax-uc630.c umax-uc840.c umax-ug630.c umax-ug80.c umax-usb.c v4l.c \
-  v4l.conf v4l-frequencies.h v4l.h
+  v4l.conf v4l-frequencies.h v4l.h \
+  sm3840.c sm3840_lib.c sm3840_params.h sm3840_scan.c sm3840.h \
+  sm3840_lib.h sm3840-s.c
+
 
 
 .PHONY: all clean depend dist distclean install uninstall
@@ -394,6 +397,10 @@
 libsane-sharp.la: ../sanei/sanei_constrain_value.lo
 libsane-sharp.la: ../sanei/sanei_scsi.lo
 libsane-sm3600.la: ../sanei/sanei_constrain_value.lo
+libsane-sm3840.la: ../sanei/sanei_config2.lo
+libsane-sm3840.la: ../sanei/sanei_constrain_value.lo
+libsane-sm3840.la: ../sanei/sanei_usb.lo
+libsane-sm3840.la: ../sanei/sanei_scsi.lo
 libsane-snapscan.la: ../sanei/sanei_config2.lo
 libsane-snapscan.la: ../sanei/sanei_constrain_value.lo
 libsane-snapscan.la: ../sanei/sanei_scsi.lo
diff -r -u sane-backends-1.0.15/configure ../sane-backends-1.0.15/configure
--- sane-backends-1.0.15/configure	2004-11-07 09:36:08.000000000 -0800
+++ ../sane-backends-1.0.15/configure	2005-01-16 14:54:28.000000000 -0800
@@ -25618,7 +25618,7 @@
           microtek2 mustek mustek_usb nec pie plustek \
           plustek_pp ricoh s9036 sceptre sharp \
           sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
-          artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash"
+          artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840"
 
   if test "${sane_cv_use_libjpeg}" != "yes"; then
     echo "*** disabling DC210 backend (failed to find JPEG library)"
diff -r -u sane-backends-1.0.15/configure.in ../sane-backends-1.0.15/configure.in
--- sane-backends-1.0.15/configure.in	2004-11-07 09:35:52.000000000 -0800
+++ ../sane-backends-1.0.15/configure.in	2005-01-16 16:38:11.000000000 -0800
@@ -299,7 +299,7 @@
           microtek2 mustek mustek_usb nec pie plustek \
           plustek_pp ricoh s9036 sceptre sharp \
           sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
-          artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash"
+          artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840"
 
   if test "${sane_cv_use_libjpeg}" != "yes"; then
     echo "*** disabling DC210 backend (failed to find JPEG library)"
diff -r -u sane-backends-1.0.15/doc/Makefile.in ../sane-backends-1.0.15/doc/Makefile.in
--- sane-backends-1.0.15/doc/Makefile.in	2004-08-03 09:22:28.000000000 -0700
+++ ../sane-backends-1.0.15/doc/Makefile.in	2005-02-06 13:24:55.001076688 -0800
@@ -52,7 +52,7 @@
           sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
           sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
           sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
-	  sane-niash.5
+	  sane-niash.5 sane-sm3840.5
 SECT7   = sane.7
 SECT8	= saned.8
 MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8)
@@ -103,7 +103,7 @@
   sane-teco1.man sane-teco2.man sane-teco3.man sane-test.man sane-sp15c.man \
   sane-hpsj5s.man gamma4scanimage.man sane-gt68xx.man sane-artec_eplus48u.man \
   sane-ma1509.man sane-ibm.man sane-hp5400.man sane-plustek_pp.man \
-  sane-u12.man sane-niash.man
+  sane-u12.man sane-niash.man sane-sm3840.man
 
 .PHONY: all clean depend dist distclean html html-man install \
   sane-html uninstall
diff -r -u sane-backends-1.0.15/doc/sane.man ../sane-backends-1.0.15/doc/sane.man
--- sane-backends-1.0.15/doc/sane.man	2004-08-03 10:28:07.000000000 -0700
+++ ../sane-backends-1.0.15/doc/sane.man	2005-02-06 13:17:35.000000000 -0800
@@ -376,6 +376,11 @@
 .BR sane\-sm3600 (5)
 for details.
 .TP
+.B sm3840
+The SANE sm3840 backend suppoert the Microtek ScanMaker 3840 USB scanner.  See
+.BR sane\-sm3840 (5)
+for details.
+.TP
 .B snapscan
 The snapscan backend supports AGFA SnapScan flatbed scanners. See
 .BR sane\-snapscan (5)
@@ -804,4 +809,4 @@
 for details).  This man page was written by Henning Meier-Geinitz. Quite a lot
 of text was taken from the
 .B SANE
-standard, several man pages, and README files.
\ No newline at end of file
+standard, several man pages, and README files.