--- camlibs/canon/canon.c	22 Aug 2004 22:19:30 -0000	1.248
+++ camlibs/canon/canon.c	9 Sep 2004 08:39:09 -0000
@@ -184,6 +187,15 @@
 	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
 	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:PowerShot S60 (normal mode)", CANON_PS_S60,     0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500,  0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	 {"Canon:PowerShot A75",        CANON_PS_A75, 	        0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	 {"Canon:PowerShot A400",	CANON_PS_A400,		0x0DA9, 0x30b7,	CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:PowerShot A310",        CANON_PS_A310,          0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, 
+	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:PowerShot A95 (normal mode)",CANON_PS_A95,  0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:PowerShot A85 (normal mode)",CANON_PS_A85,  0x04A9, 0x30be, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 
 	{NULL}
 	/* *INDENT-ON* */
diff -u -3 -p -r1.95 canon.h
--- camlibs/canon/canon.h	14 Aug 2004 00:24:12 -0000	1.95
+++ camlibs/canon/canon.h	9 Sep 2004 08:39:09 -0000
@@ -68,7 +68,10 @@
  * @CANON_PS_A50: PowerShot A50
  * @CANON_PS_A60: PowerShot A60
  * @CANON_PS_A70: PowerShot A70
+ * @CANON_PS_A75: PowerShot A75
+ * @CANON_PS_A85: PowerShot A95
  * @CANON_PS_A80: PowerShot A80
+ * @CANON_PS_A95: PowerShot A95
  * @CANON_PS_PRO70: PowerShot Pro70
  * @CANON_PS_S10: PowerShot S10
  * @CANON_PS_S20: PowerShot S20
@@ -91,11 +94,15 @@
  * @CANON_PS_A300: PowerShot A300
  * @CANON_PS_S200: PowerShot S200, Digital IXUS v2
  * @CANON_PS_S330: Digital IXUS 330
+ * @CANON_PS_S410: Digital IXUS 430
+ * @CANON_PS_S500: Digital IXUS 500
  * @CANON_PS_S45: PowerShot S45
+ * @CANON_PS_S60: PowerShot S60
  * @CANON_PS_G3: PowerShot G3
  * @CANON_PS_G5: PowerShot G5
  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
  * @CANON_MV630I: MV630i camcorder
+ * @CANON_MV650I: MV650i camcorder
  * @CANON_EOS_10D: EOS 10D
  * @CANON_OPT_10: Optura 10
  * @CANON_OPT_20: Optura 20
@@ -109,6 +116,7 @@
  * @CANON_PS_S50: PowerShot S50
  * @CANON_PS_S400: PowerShot S400, Digital IXUS 400
  * @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
+ * @CANON_PS_A400: PowerShot A400
  *
  * Enumeration of all camera types currently supported.
  *
@@ -119,7 +127,10 @@
 	CANON_PS_A50,
 	CANON_PS_A60,
 	CANON_PS_A70,
+	CANON_PS_A75,
 	CANON_PS_A80,
+	CANON_PS_A85,
+  	CANON_PS_A95,
 	CANON_PS_S10,
 	CANON_PS_S20,
 	CANON_PS_S30,
@@ -141,11 +152,14 @@
 	CANON_PS_A100,
 	CANON_PS_A200,
 	CANON_PS_A300,
+	CANON_PS_A310,
+	CANON_PS_A400,
 	CANON_PS_S50,
 	CANON_PS_S45,
 	CANON_PS_G3,
 	CANON_PS_S230,
 	CANON_MV630I,
+	CANON_MV650I,
 	CANON_EOS_10D,
 	CANON_OPT_200,
 	/* In Mac OS Image Capture, but not yet seen in the wild. */
@@ -156,6 +170,9 @@
 	CANON_PS_UNK5,
 	/* other cameras */
 	CANON_PS_S400,
+	CANON_PS_S410,
+	CANON_PS_S60,
+	CANON_PS_S500,
 	CANON_PS_SD100,
 	CANON_EOS_300D,
 	CANON_PS_G5,