diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog
index f152932dd..1e51930c3 100644
--- a/camlibs/canon/ChangeLog
+++ b/camlibs/canon/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-02  Marcus Meissner <marcus@jet.franken.de>
+
+	* canon.c, usb.c: lock keys and audio support in PowerShot S50, from
+	  rcaputo@users.sf.net
+
 2003-11-08  Hans Ulrich Niedermann  <gp@n-dimensional.de>
 
 	* canon.c, canon.h: Added support for Optura 20 (reported by Walt H)
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index c36fd9d80..24466861e 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -312,6 +312,7 @@ canon_int_filename2audioname (Camera *camera, const char *filename)
 	case CANON_PS_S30:
 	case CANON_PS_S40:
 	case CANON_PS_S45:
+	case CANON_PS_S50:
 	case CANON_PS_S400:
 	case CANON_PS_G3:
 	case CANON_PS_G5:
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index d5b12bac0..cf21aada3 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -357,6 +357,7 @@ canon_usb_lock_keys (Camera *camera, GPContext *context)
 			break;
 
 		case CANON_PS_S45:
+		case CANON_PS_S50:
 		case CANON_PS_G3:
 		case CANON_PS_G5:
 		default: