diff --git a/camlibs/ptp2/cameras/canon-eos-r8.txt b/camlibs/ptp2/cameras/canon-eos-r8.txt
index c7ab5427d..cd6e377d0 100644
--- a/camlibs/ptp2/cameras/canon-eos-r8.txt
+++ b/camlibs/ptp2/cameras/canon-eos-r8.txt
@@ -762,15 +762,15 @@ END
 Label: AF Method
 Readonly: 0
 Type: RADIO
-Current: Unknown value 000e
+Current: WholeAreaAF
 Choice: 0 LiveSpotAF
 Choice: 1 Live
 Choice: 2 LiveSingleExpandCross
 Choice: 3 LiveSingleExpandSurround
-Choice: 4 Unknown value 000b
-Choice: 5 Unknown value 000c
-Choice: 6 Unknown value 000d
-Choice: 7 Unknown value 000e
+Choice: 4 FlexibleZoneAF1
+Choice: 5 FlexibleZoneAF2
+Choice: 6 FlexibleZoneAF3
+Choice: 7 WholeAreaAF
 END
 /main/capturesettings/storageid
 Label: Storage Device
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 4ca229fbc..2edcf33af 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -2474,6 +2474,7 @@ static struct deviceproptableu16 canon_shutterspeed[] = {
 	{ "1/6000",	0x009c,0 },
 	{ "1/6400",	0x009d,0 },
 	{ "1/8000",	0x00a0,0 },
+	{ "1/16000",	0x00a8,0 },
 };
 GENERIC16TABLE(Canon_ShutterSpeed,canon_shutterspeed)
 
@@ -2567,6 +2568,10 @@ static struct deviceproptableu32 canon_eos_afmethod[] = {
 	{ N_("LiveZoneLargeV"),		8, 0 },
 	{ N_("LiveCatchAF"),		9, 0 },
 	{ N_("LiveSpotAF"),		10, 0 },
+	{ N_("FlexibleZoneAF1"),	11, 0 },
+	{ N_("FlexibleZoneAF2"),	12, 0 },
+	{ N_("FlexibleZoneAF3"),	13, 0 },
+	{ N_("WholeAreaAF"),		14, 0 },
 };
 GENERIC32TABLE(Canon_EOS_AFMethod,canon_eos_afmethod)