diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index 3cbaef50c..cbbbb2069 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -8943,6 +8943,22 @@ ptp_opcode_trans_t ptp_opcode_canon_trans[] = {
 	{PTP_OC_CANON_EOS_SetCAssistMode,"EOS_SetCAssistMode"},
 	{PTP_OC_CANON_EOS_GetCAssistPresetThumb,"EOS_GetCAssistPresetThumb"},
 	{PTP_OC_CANON_EOS_DeleteWFTSettingNumber,"EOS_DeleteWFTSettingNumber"},
+	{PTP_OC_CANON_GetDebugLog,"CANON_GetDebugLog"},
+	{PTP_OC_CANON_Clear_CCAPI_UsageCount,"CANON_Clear_CCAPI_UsageCount"},
+	{PTP_OC_CANON_SetMetaProperty,"CANON_SetMetaProperty"},
+	{PTP_OC_CANON_EOS_SetManipulationToggleImageSide,"CANON_EOS_SetManipulationToggleImageSide"},
+	{PTP_OC_CANON_EOS_GetLensSerialNumHistory,"CANON_EOS_GetLensSerialNumHistory"},
+	{PTP_OC_CANON_EOS_SetRemoteErrLogMode,"CANON_EOS_SetRemoteErrLogMode"},
+	{PTP_OC_CANON_EOS_GetRemoteErrLogMode,"CANON_EOS_GetRemoteErrLogMode"},
+	{PTP_OC_CANON_EOS_GetDebugLogEx,"CANON_EOS_GetDebugLogEx"},
+	{PTP_OC_CANON_EOS_SendWifiSetting,"CANON_EOS_SendWifiSetting"},
+	{PTP_OC_CANON_EOS_SendWifiDetailSetting,"CANON_EOS_SendWifiDetailSetting"},
+	{PTP_OC_CANON_EOS_EdgeFocusPosition,"CANON_EOS_EdgeFocusPosition"},
+	{PTP_OC_CANON_EOS_DriveFocusToEdge,"CANON_EOS_DriveFocusToEdge"},
+	{PTP_OC_CANON_EOS_DriveFocus,"CANON_EOS_DriveFocus"},
+	{PTP_OC_CANON_EOS_DV_Get_WavInfo,"CANON_EOS_DV_Get_WavInfo"},
+	{PTP_OC_CANON_EOS_DV_Overwrite_Contents_XML,"CANON_EOS_DV_Overwrite_Contents_XML"},
+	{PTP_OC_CANON_EOS_DV_Get_Template_XML,"CANON_EOS_DV_Get_Template_XML"},
 };
 
 ptp_opcode_trans_t ptp_opcode_sony_trans[] = {
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index c3fd39dba..d8c61584e 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -358,7 +358,10 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_OC_CANON_RequestTranscodeCancel	0x9079 /* 1 arg: oid? */
 
 #define PTP_OC_CANON_SetRemoteShootingMode	0x9086
+#define PTP_OC_CANON_GetDebugLog		0x9087
 #define PTP_OC_CANON_SetModeDialDisable		0x9088
+#define PTP_OC_CANON_Clear_CCAPI_UsageCount	0x9089
+#define PTP_OC_CANON_SetMetaProperty		0x908A
 
 /* 9101: no args, 8 byte data (01 00 00 00 00 00 00 00), no resp data. */
 #define PTP_OC_CANON_EOS_GetStorageIDs		0x9101
@@ -510,6 +513,8 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_OC_CANON_EOS_SetLvPcFlavoreditParam	0x915D /* 1 arg */
 #define PTP_OC_CANON_EOS_RequestSensorCleaning	0x915E /* 1 arg? */
 #define PTP_OC_CANON_EOS_AfCancel		0x9160
+#define PTP_OC_CANON_EOS_SetManipulationToggleImageSide	0x9166
+#define PTP_OC_CANON_EOS_GetLensSerialNumHistory	0x9167
 #define PTP_OC_CANON_EOS_SetImageRecoveryDataEx	0x916B
 #define PTP_OC_CANON_EOS_GetImageRecoveryListEx	0x916C
 #define PTP_OC_CANON_EOS_CompleteAutoSendImages	0x916D
@@ -524,6 +529,9 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_OC_CANON_EOS_NotifySaveComplete	0x9177
 #define PTP_OC_CANON_EOS_GetTranscodedBlock	0x9178
 #define PTP_OC_CANON_EOS_TransferCompleteTranscodedBlock	0x9179
+#define PTP_OC_CANON_EOS_SetRemoteErrLogMode	0x917B
+#define PTP_OC_CANON_EOS_GetRemoteErrLogMode	0x917C
+#define PTP_OC_CANON_EOS_GetDebugLogEx	0x917D
 #define PTP_OC_CANON_EOS_NotifyEstimateNumberofImport		0x9182 /* 1 arg: importnumber */
 #define PTP_OC_CANON_EOS_NotifyNumberofImported	0x9183 /* 1 arg: importnumber */
 #define PTP_OC_CANON_EOS_NotifySizeOfPartialDataTransfer	0x9184 /* 4 args: filesizelow, filesizehigh, downloadsizelow, downloadsizehigh */
@@ -536,6 +544,8 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_OC_CANON_EOS_GetObjectURL		0x91AB
 #define PTP_OC_CANON_EOS_SetCAssistMode		0x91AC
 #define PTP_OC_CANON_EOS_GetCAssistPresetThumb	0x91AD
+#define PTP_OC_CANON_EOS_SendWifiSetting	0x91B1
+#define PTP_OC_CANON_EOS_SendWifiDetailSetting	0x91B2
 #define PTP_OC_CANON_EOS_SetFELock		0x91B9
 #define PTP_OC_CANON_EOS_DeleteWFTSettingNumber	0x91BA
 #define PTP_OC_CANON_EOS_SetDefaultCameraSetting		0x91BE
@@ -550,6 +560,15 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_OC_CANON_EOS_FAPIMessageTX		0x91FE
 #define PTP_OC_CANON_EOS_FAPIMessageRX		0x91FF
 
+#define PTP_OC_CANON_EOS_EdgeFocusPosition	0x9200
+#define PTP_OC_CANON_EOS_DriveFocusToEdge	0x9201
+#define PTP_OC_CANON_EOS_DriveFocus		0x9202
+
+#define PTP_OC_CANON_EOS_DV_Get_WavInfo			0x9401
+#define PTP_OC_CANON_EOS_DV_Overwrite_Contents_XML	0x9402
+#define PTP_OC_CANON_EOS_DV_Get_Template_XML		0x9403
+
+
 /* A1E8 ... also seen? is an error code? */
 
 /* Nikon extension Operation Codes */
@@ -1294,6 +1313,10 @@ typedef struct _PTPIPHeader PTPIPHeader;
 #define PTP_EC_CANON_EOS_RequestAutoSendImages		0xc1b1
 #define PTP_EC_CANON_EOS_RequestTranscodedBlockTransfer	0xc1b2
 #define PTP_EC_CANON_EOS_RequestCAssistImage		0xc1b4
+#define PTP_EC_CANON_EOS_HiFreqFlickerlessAutodetectResult		0xc1b5
+#define PTP_EC_CANON_EOS_ObjectAddedEx64LFN		0xc1b6
+#define PTP_EC_CANON_EOS_ObjectInfoChangedEx64LFN	0xc1b7
+#define PTP_EC_CANON_EOS_RequestObjectTransfer64LFN	0xc1b8
 #define PTP_EC_CANON_EOS_RequestObjectTransferFTP	0xc1f1
 
 /* Nikon extension Event Codes */