diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog
index 581b03c16..06d16a49a 100644
--- a/camlibs/canon/ChangeLog
+++ b/camlibs/canon/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-02  Marcus Meissner  <marcus@jet.franken.de>
+
+	* canon.c: Handle IXUS 30 also in ptp driver.
+
 2007-06-03  Paul Walmsley  <paul@booyaka.com>
 
 	* usb.c: remove one last CANON_EXPERIMENTAL_SECONDARY_IMAGE ifdef
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index e0563a70d..9e2ff1d83 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -286,9 +286,12 @@ const struct canonCamModelData models[] = {
 
         /* 0x30bf is PowerShot SD300/Digital IXUS 40 in PTP mode */
         /* Another block of cameras that share the ID for PTP and Canon modes */
+#if 0 /* in ptp driver due to hangs :( */
         {"Canon:PowerShot SD200 (normal mode)", CANON_CLASS_6,  0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
         {"Canon:Digital IXUS 30 (normal mode)", CANON_CLASS_6,  0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
         {"Canon:IXY Digital 40 (normal mode)",  CANON_CLASS_6,  0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+#endif
+
         {"Canon:PowerShot SD400 (normal mode)", CANON_CLASS_4,  0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
         {"Canon:Digital IXUS 50 (normal mode)", CANON_CLASS_4,  0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
         {"Canon:IXY Digital 55 (normal mode)",  CANON_CLASS_4,  0x04A9, 0x30c1, CAP_NON, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},