diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c
index 16908e485..381da7dd2 100644
--- a/backend/snapscan-scsi.c
+++ b/backend/snapscan-scsi.c
@@ -552,9 +552,11 @@ static SANE_Status inquiry (SnapScan_Scanner *pss)
     case PERFECTION3490:
     case PRISA5150:
     case PRISA5000:
-    case STYLUS_CX1500:
         pss->bpp = 14;
         break;
+    case STYLUS_CX1500:
+        pss->bpp = 12;
+        break;
     default:
         pss->bpp = 8;
         if (pss->hconfig & HCFG_ADC)
@@ -658,6 +660,10 @@ static void release_unit (SnapScan_Scanner *pss)
 #define DTCQ_GAMMA_RED10 0x81
 #define DTCQ_GAMMA_GREEN10 0x82
 #define DTCQ_GAMMA_BLUE10 0x83
+#define DTCQ_GAMMA_GRAY12 0x90
+#define DTCQ_GAMMA_RED12 0x91
+#define DTCQ_GAMMA_GREEN12 0x92
+#define DTCQ_GAMMA_BLUE12 0x93
 #define DTCQ_GAMMA_GRAY14 0x95 /* ? */
 #define DTCQ_GAMMA_RED14 0x96
 #define DTCQ_GAMMA_GREEN14 0x97
@@ -716,6 +722,12 @@ static SANE_Status send (SnapScan_Scanner *pss, u_char dtc, u_char dtcq)
         case DTCQ_GAMMA_BLUE10:
             tl = 1024;
             break;
+        case DTCQ_GAMMA_GRAY12:    /* 12-bit tables */
+        case DTCQ_GAMMA_RED12:
+        case DTCQ_GAMMA_GREEN12:
+        case DTCQ_GAMMA_BLUE12:
+            tl = 4096;
+            break;
         case DTCQ_GAMMA_GRAY14:    /* 14-bit tables */
         case DTCQ_GAMMA_RED14:
         case DTCQ_GAMMA_GREEN14:
@@ -1515,6 +1527,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
+ * Revision 1.56  2006/01/10 19:32:16  oliver-guest
+ * Added 12 bit gamma tables for Epson Stylus CX-1500
+ *
  * Revision 1.55  2006/01/06 20:59:17  oliver-guest
  * Some fixes for the Epson Stylus CX 1500
  *
diff --git a/backend/snapscan.c b/backend/snapscan.c
index 0c31e5538..e7870efe5 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -79,7 +79,7 @@
 
 #define EXPECTED_MAJOR       1
 #define MINOR_VERSION        4
-#define BUILD               52
+#define BUILD               53
 #define BACKEND_NAME snapscan
 
 #ifdef __GNUC__
@@ -1373,6 +1373,12 @@ static SANE_Status download_gamma_tables (SnapScan_Scanner *pss)
         dtcq_gamma_green = DTCQ_GAMMA_GREEN10;
         dtcq_gamma_blue = DTCQ_GAMMA_BLUE10;
         break;
+    case 12:
+        dtcq_gamma_gray = DTCQ_GAMMA_GRAY12;
+        dtcq_gamma_red = DTCQ_GAMMA_RED12;
+        dtcq_gamma_green = DTCQ_GAMMA_GREEN12;
+        dtcq_gamma_blue = DTCQ_GAMMA_BLUE12;
+        break;
     case 14:
         if (pss->bpp_scan == 16)
         {
@@ -1924,6 +1930,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 
 /*
  * $Log$
+ * Revision 1.67  2006/01/10 19:32:16  oliver-guest
+ * Added 12 bit gamma tables for Epson Stylus CX-1500
+ *
  * Revision 1.66  2006/01/06 20:59:17  oliver-guest
  * Some fixes for the Epson Stylus CX 1500
  *