diff --git a/ChangeLog b/ChangeLog
index 3f158da5a..0883d4f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-07  Karl Heinz Kremer <khk@khk.net>
+
+	* backend/epson.h, backend/epson_usb.h: Increase timeout for lamp warmup
+	  from 60 to 120 seconds
+
 2004-02-07  Eddy De Greef <eddy_de_greef at tiscali dot be>
 
 	* backend/mustek_pp_cis.c: cleaned up debug code
diff --git a/backend/epson.h b/backend/epson.h
index 4b1bc114b..e7520b5ca 100644
--- a/backend/epson.h
+++ b/backend/epson.h
@@ -78,6 +78,8 @@
 
 #define LINES_SHUFFLE_MAX	(17)	/* 2 x 8 lines plus 1 */
 
+#define SANE_EPSON_MAX_RETRIES	(120)	/* how often do we retry during warmup ? */
+
 typedef struct {
 	char * level;
 
diff --git a/backend/epson_usb.h b/backend/epson_usb.h
index 7bee7e593..e680f6aea 100644
--- a/backend/epson_usb.h
+++ b/backend/epson_usb.h
@@ -2,7 +2,6 @@
 #define _EPSON_USB_H_
 
 #define SANE_EPSON_VENDOR_ID	(0x4b8)
-#define SANE_EPSON_MAX_RETRIES	(61)
 
 extern SANE_Word sanei_epson_usb_product_ids [];