diff --git a/ChangeLog b/ChangeLog
index 9ccb820e7..cc3847154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
 	  to libtool 1.5.10.
 	* doc/descriptions/unsupported.desc: Added link to
 	  Microtek Filmscan 35. 
+	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_high.c
+	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
+	  Fixed typos. Added Packard Bell Diamond 2450 to .conf and
+	  changed status to "good". Avoid error message when closing
+	  scanner. Don't print max_white warning when debugging is not
+	  enabled.
 
 2004-10-11  Oliver Schirrmeister (oschirr@abm.de)
 
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index b1398e410..0fa2eae9d 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -48,7 +48,7 @@
 
 #include "../include/sane/config.h"
 
-#define BUILD 64
+#define BUILD 65
 #define MAX_DEBUG
 #define WARMUP_TIME 60
 #define CALIBRATION_HEIGHT 2.5
@@ -567,7 +567,7 @@ init_options (GT68xx_Scanner * s)
   s->opt[OPT_FULL_SCAN].title = SANE_I18N ("Full scan");
   s->opt[OPT_FULL_SCAN].desc = 
     SANE_I18N ("Scan the complete scanning area including calibration strip. "
-	       "Be carefull. Don't select the full height. For testing only.");
+	       "Be careful. Don't select the full height. For testing only.");
   s->opt[OPT_FULL_SCAN].type = SANE_TYPE_BOOL;
   s->opt[OPT_FULL_SCAN].unit = SANE_UNIT_NONE;
   s->opt[OPT_FULL_SCAN].constraint_type = SANE_CONSTRAINT_NONE;
@@ -1405,6 +1405,7 @@ void
 sane_close (SANE_Handle handle)
 {
   GT68xx_Scanner *prev, *s;
+  GT68xx_Device *dev;
 
   DBG (5, "sane_close: start\n");
 
@@ -1429,9 +1430,11 @@ sane_close (SANE_Handle handle)
 
   if (s->val[OPT_LAMP_OFF_AT_EXIT].w == SANE_TRUE)
     gt68xx_device_lamp_control (s->dev, SANE_FALSE, SANE_FALSE);
-  gt68xx_device_deactivate (s->dev);
-  gt68xx_device_close (s->dev);
+
+  dev = s->dev;
   gt68xx_scanner_free (s);
+  gt68xx_device_deactivate (dev);
+  gt68xx_device_close (dev);
 
   DBG (5, "sane_close: exit\n");
 }
diff --git a/backend/gt68xx.conf b/backend/gt68xx.conf
index cba6a5aac..9ec2c0b9d 100644
--- a/backend/gt68xx.conf
+++ b/backend/gt68xx.conf
@@ -91,7 +91,8 @@ usb 0x055f 0x0218
 #model "Bearpaw 2400 CS"
 
 ##############################################################################
-# Autodetect Mustek BearPaw 2400 TA Plus and Trust 240TH Easy Webscan Gold
+# Autodetect Mustek BearPaw 2400 TA Plus, Packard Bell Diamond 2450, and
+# Trust 240TH Easy Webscan Gold
 usb 0x055f 0x0219
 
 # Mustek BearPaw 2400 TA doesn't need any manual settings
@@ -100,6 +101,10 @@ usb 0x055f 0x0219
 #vendor "Trust"
 #model "240TH Easy Webscan Gold"
 
+# Packard Bell Diamond 2450:
+#vendor "Packard Bell"
+#model "Diamond 2450"
+
 ##############################################################################
 # Autodetect Mustek BearPaw 2448 TA Plus and Mustek BearPaw 2448 CS Plus
 usb 0x055f 0x021a
diff --git a/backend/gt68xx_high.c b/backend/gt68xx_high.c
index a20438a40..ecd27c215 100644
--- a/backend/gt68xx_high.c
+++ b/backend/gt68xx_high.c
@@ -658,7 +658,7 @@ gt68xx_scanner_calibrate (GT68xx_Scanner * scanner,
 
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (5, "gt68xx_scanner_calibrate: gt68xx_set_gain failed: %s\n",
+	  DBG (5, "gt68xx_scanner_calibrate: gt68xx_afe_*_auto failed: %s\n",
 		 sane_strstatus (status));
 	  return status;
 	}
@@ -1009,7 +1009,7 @@ gt68xx_afe_ccd_calc (GT68xx_Afe_Values * values, unsigned int *buffer)
   values->white = max_white;
   if (values->white < 50 || values->black > 150
       || values->white - values->black < 30 || max_black - min_black > 15)
-    DBG (0, "gt68xx_afe_ccd_calc: WARNING: max_white %3d   min_black %3d  max_black %3d\n",
+    DBG (1, "gt68xx_afe_ccd_calc: WARNING: max_white %3d   min_black %3d  max_black %3d\n",
 	   values->white, values->black, max_black);
   else
     DBG (5, "gt68xx_afe_ccd_calc: max_white %3d   min_black %3d  max_black %3d\n",
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index 439844bc3..ced824c3b 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-64"
+:version "1.0-65"
 :manpage "sane-gt68xx"
 :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
 :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."
@@ -248,7 +248,7 @@
 :comment "Similar to Mustek BearPaw 1200 Plus"
 
 :model "Diamond 2450"
-:status :basic
+:status :good
 :interface "USB"
 ;:comment "Needs more testing."
 
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index d6e646ba0..55fd21c44 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -1,5 +1,13 @@
 gt68xx.CHANGES -*-text-*-
 
+V 1.0.65 (2004-10-11)
+
+* Used new lamp option from saneopts.h.
+* Fixed typos.
+* Added Packard Bell Diamond 2450 to .conf and changed status to "good".
+* Avoid error message when closing scanner.
+* Don't print max_white warning when debugging is not enabled.
+
 V 1.0.64 (2004-10-02)
 
 * Added Trust 240TH easy Webscan Gold to list of supported devices.