diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc
index 3b0d9c9ef..0c6cafffa 100644
--- a/rtexif/canonattribs.cc
+++ b/rtexif/canonattribs.cc
@@ -660,9 +660,9 @@ public:
             {125, "Canon TS-E 24mm f/3.5L"},
             {126, "Canon TS-E 45mm f/2.8"},
             {127, "Canon TS-E 90mm f/2.8"},
-            {129, "Canon EF 300mm f/2.8L"},
-            {130, "Canon EF 50mm f/1.0L"},
-            {131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens"},
+            {129, "Canon EF 300mm f/2.8L USM"},
+            {130, "Canon EF 50mm f/1.0L USM"},
+            {131, "Canon EF 28-80mm f/2.8-4L USM or Sigma Lens"},
             {131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"},
             {131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"},
             {131, "Sigma 17-70mm f/2.8-4.5 DC Macro"},
@@ -670,11 +670,11 @@ public:
             {131, "Sigma APO 120-300mm f/2.8 EX DG HSM"},
             {131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"},
             {131, "Sigma 70-200mm f/2.8 APO EX HSM"},
-            {132, "Canon EF 1200mm f/5.6L"},
-            {134, "Canon EF 600mm f/4L IS"},
-            {135, "Canon EF 200mm f/1.8L"},
-            {136, "Canon EF 300mm f/2.8L"},
-            {137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens"},
+            {132, "Canon EF 1200mm f/5.6L USM"},
+            {134, "Canon EF 600mm f/4L IS USM"},
+            {135, "Canon EF 200mm f/1.8L USM"},
+            {136, "Canon EF 300mm f/2.8L USM"},
+            {137, "Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens"},
             {137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"},
             {137, "Sigma 50-200mm f/4-5.6 DC OS HSM"},
             {137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"},
@@ -692,11 +692,11 @@ public:
             {137, "Sigma 18-35mm f/1.8 DC HSM"},
             {137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"},
             {138, "Canon EF 28-80mm f/2.8-4L"},
-            {139, "Canon EF 400mm f/2.8L"},
-            {140, "Canon EF 500mm f/4.5L"},
-            {141, "Canon EF 500mm f/4.5L"},
-            {142, "Canon EF 300mm f/2.8L IS"},
-            {143, "Canon EF 500mm f/4L IS or Sigma Lens"},
+            {139, "Canon EF 400mm f/2.8L USM"},
+            {140, "Canon EF 500mm f/4.5L USM"},
+            {141, "Canon EF 500mm f/4.5L USM"},
+            {142, "Canon EF 300mm f/2.8L IS USM"},
+            {143, "Canon EF 500mm f/4L IS USM or Sigma Lens"},
             {143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"},
             {144, "Canon EF 35-135mm f/4-5.6 USM"},
             {145, "Canon EF 100-300mm f/4.5-5.6 USM"},
@@ -704,18 +704,18 @@ public:
             {147, "Canon EF 35-135mm f/4-5.6 USM"},
             {148, "Canon EF 28-80mm f/3.5-5.6 USM"},
             {149, "Canon EF 100mm f/2 USM"},
-            {150, "Canon EF 14mm f/2.8L or Sigma Lens"},
+            {150, "Canon EF 14mm f/2.8L USM or Sigma Lens"},
             {150, "Sigma 20mm EX f/1.8"},
             {150, "Sigma 30mm f/1.4 DC HSM"},
             {150, "Sigma 24mm f/1.8 DG Macro EX"},
             {150, "Sigma 28mm f/1.8 DG Macro EX"},
-            {151, "Canon EF 200mm f/2.8L"},
-            {152, "Canon EF 300mm f/4L IS or Sigma Lens"},
+            {151, "Canon EF 200mm f/2.8L USM"},
+            {152, "Canon EF 300mm f/4L IS USM or Sigma Lens"},
             {152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"},
             {152, "Sigma 14mm f/2.8 EX Aspherical HSM"},
             {152, "Sigma 10-20mm f/4-5.6"},
             {152, "Sigma 100-300mm f/4"},
-            {153, "Canon EF 35-350mm f/3.5-5.6L or Sigma or Tamron Lens"},
+            {153, "Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens"},
             {153, "Sigma 50-500mm f/4-6.3 APO HSM EX"},
             {153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"},
             {153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"},
@@ -724,7 +724,7 @@ public:
             {154, "Zeiss Milvus 21mm f/2.8"},
             {155, "Canon EF 85mm f/1.8 USM"},
             {156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"},
-            {156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD"},
+            {156, "Tamron SP 70-300mm f/4-5.6 Di VC USD"},
             {156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
             {160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"},
             {160, "Tamron AF 19-35mm f/3.5-4.5"},
@@ -732,7 +732,7 @@ public:
             {160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"},
             {160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"},
             {160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"},
-            {161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"},
+            {161, "Canon EF 28-70mm f/2.8L USM or Sigma or Tamron Lens"},
             {161, "Sigma 24-70mm f/2.8 EX"},
             {161, "Sigma 28-70mm f/2.8 EX"},
             {161, "Sigma 24-60mm f/2.8 EX DG"},
@@ -740,15 +740,15 @@ public:
             {161, "Tamron 90mm f/2.8"},
             {161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
             {161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
-            {162, "Canon EF 200mm f/2.8L"},
+            {162, "Canon EF 200mm f/2.8L USM"},
             {163, "Canon EF 300mm f/4L"},
             {164, "Canon EF 400mm f/5.6L"},
-            {165, "Canon EF 70-200mm f/2.8 L"},
-            {166, "Canon EF 70-200mm f/2.8 L + 1.4x"},
-            {167, "Canon EF 70-200mm f/2.8 L + 2x"},
+            {165, "Canon EF 70-200mm f/2.8L USM"},
+            {166, "Canon EF 70-200mm f/2.8L USM + 1.4x"},
+            {167, "Canon EF 70-200mm f/2.8L USM + 2x"},
             {168, "Canon EF 28mm f/1.8 USM or Sigma Lens"},
             {168, "Sigma 50-100mm f/1.8 DC HSM | A"},
-            {169, "Canon EF 17-35mm f/2.8L or Sigma Lens"},
+            {169, "Canon EF 17-35mm f/2.8L USM or Sigma Lens"},
             {169, "Sigma 18-200mm f/3.5-6.3 DC OS"},
             {169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"},
             {169, "Sigma 18-50mm f/2.8 Macro"},
@@ -756,46 +756,46 @@ public:
             {169, "Sigma 85mm f/1.4 EX DG HSM"},
             {169, "Sigma 30mm f/1.4 EX DC HSM"},
             {169, "Sigma 35mm f/1.4 DG HSM"},
-            {170, "Canon EF 200mm f/2.8L II"},
-            {171, "Canon EF 300mm f/4L"},
-            {172, "Canon EF 400mm f/5.6L or Sigma Lens"},
+            {170, "Canon EF 200mm f/2.8L II USM"},
+            {171, "Canon EF 300mm f/4L USM"},
+            {172, "Canon EF 400mm f/5.6L USM or Sigma Lens"},
             {172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
-            {173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"},
+            {173, "Canon EF 180mm Macro f/3.5L USM or Sigma Lens"},
             {173, "Sigma 180mm EX HSM Macro f/3.5"},
             {173, "Sigma APO Macro 150mm f/2.8 EX DG HSM"},
-            {174, "Canon EF 135mm f/2L or Other Lens"},
+            {174, "Canon EF 135mm f/2L USM or Other Lens"},
             {174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"},
             {174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"},
             {174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"},
             {174, "Zeiss Milvus 100mm f/2 Makro"},
-            {175, "Canon EF 400mm f/2.8L"},
+            {175, "Canon EF 400mm f/2.8L USM"},
             {176, "Canon EF 24-85mm f/3.5-4.5 USM"},
-            {177, "Canon EF 300mm f/4L IS"},
+            {177, "Canon EF 300mm f/4L IS USM"},
             {178, "Canon EF 28-135mm f/3.5-5.6 IS"},
-            {179, "Canon EF 24mm f/1.4L"},
-            {180, "Canon EF 35mm f/1.4L or Other Lens"},
+            {179, "Canon EF 24mm f/1.4L USM"},
+            {180, "Canon EF 35mm f/1.4L USM or Other Lens"},
             {180, "Sigma 50mm f/1.4 DG HSM | A"},
             {180, "Sigma 24mm f/1.4 DG HSM | A"},
             {180, "Zeiss Milvus 50mm f/1.4"},
             {180, "Zeiss Milvus 85mm f/1.4"},
             {180, "Zeiss Otus 28mm f/1.4 ZE"},
-            {181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens"},
+            {181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens"},
             {181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"},
-            {182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens"},
+            {182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens"},
             {182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x"},
-            {183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"},
+            {183, "Canon EF 100-400mm f/4.5-5.6L IS USM or Sigma Lens"},
             {183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"},
             {183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"},
             {183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
             {183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
             {183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
             {183, "Sigma 100-400mm f/5-6.3 DG OS HSM"},
-            {184, "Canon EF 400mm f/2.8L + 2x"},
-            {185, "Canon EF 600mm f/4L IS"},
-            {186, "Canon EF 70-200mm f/4L"},
-            {187, "Canon EF 70-200mm f/4L + 1.4x"},
-            {188, "Canon EF 70-200mm f/4L + 2x"},
-            {189, "Canon EF 70-200mm f/4L + 2.8x"},
+            {184, "Canon EF 400mm f/2.8L USM + 2x"},
+            {185, "Canon EF 600mm f/4L IS USM"},
+            {186, "Canon EF 70-200mm f/4L USM"},
+            {187, "Canon EF 70-200mm f/4L USM + 1.4x"},
+            {188, "Canon EF 70-200mm f/4L USM + 2x"},
+            {189, "Canon EF 70-200mm f/4L USM + 2.8x"},
             {190, "Canon EF 100mm f/2.8 Macro USM"},
             {191, "Canon EF 400mm f/4 DO IS"},
             {193, "Canon EF 35-80mm f/4-5.6 USM"},
@@ -824,35 +824,35 @@ public:
             {214, "Canon EF-S 18-55mm f/3.5-5.6 USM"},
             {215, "Canon EF 55-200mm f/4.5-5.6 II USM"},
             {217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"},
-            {224, "Canon EF 70-200mm f/2.8L IS"},
-            {225, "Canon EF 70-200mm f/2.8L IS + 1.4x"},
-            {226, "Canon EF 70-200mm f/2.8L IS + 2x"},
-            {227, "Canon EF 70-200mm f/2.8L IS + 2.8x"},
+            {224, "Canon EF 70-200mm f/2.8L IS USM"},
+            {225, "Canon EF 70-200mm f/2.8L IS USM + 1.4x"},
+            {226, "Canon EF 70-200mm f/2.8L IS USM + 2x"},
+            {227, "Canon EF 70-200mm f/2.8L IS USM + 2.8x"},
             {228, "Canon EF 28-105mm f/3.5-4.5 USM"},
-            {229, "Canon EF 16-35mm f/2.8L"},
-            {230, "Canon EF 24-70mm f/2.8L"},
-            {231, "Canon EF 17-40mm f/4L"},
+            {229, "Canon EF 16-35mm f/2.8L USM"},
+            {230, "Canon EF 24-70mm f/2.8L USM"},
+            {231, "Canon EF 17-40mm f/4L USM"},
             {232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"},
-            {233, "Canon EF 28-300mm f/3.5-5.6L IS"},
+            {233, "Canon EF 28-300mm f/3.5-5.6L IS USM"},
             {234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens"},
             {234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"},
             {235, "Canon EF-S 10-22mm f/3.5-4.5 USM"},
             {236, "Canon EF-S 60mm f/2.8 Macro USM"},
-            {237, "Canon EF 24-105mm f/4L IS"},
+            {237, "Canon EF 24-105mm f/4L IS USM"},
             {238, "Canon EF 70-300mm f/4-5.6 IS USM"},
-            {239, "Canon EF 85mm f/1.2L II"},
+            {239, "Canon EF 85mm f/1.2L II USM"},
             {240, "Canon EF-S 17-55mm f/2.8 IS USM"},
-            {241, "Canon EF 50mm f/1.2L"},
-            {242, "Canon EF 70-200mm f/4L IS"},
-            {243, "Canon EF 70-200mm f/4L IS + 1.4x"},
-            {244, "Canon EF 70-200mm f/4L IS + 2x"},
-            {245, "Canon EF 70-200mm f/4L IS + 2.8x"},
-            {246, "Canon EF 16-35mm f/2.8L II"},
+            {241, "Canon EF 50mm f/1.2L USM"},
+            {242, "Canon EF 70-200mm f/4L IS USM"},
+            {243, "Canon EF 70-200mm f/4L IS USM + 1.4x"},
+            {244, "Canon EF 70-200mm f/4L IS USM + 2x"},
+            {245, "Canon EF 70-200mm f/4L IS USM + 2.8x"},
+            {246, "Canon EF 16-35mm f/2.8L II USM"},
             {247, "Canon EF 14mm f/2.8L II USM"},
-            {248, "Canon EF 200mm f/2L IS or Sigma Lens"},
+            {248, "Canon EF 200mm f/2L IS USM or Sigma Lens"},
             {248, "Sigma 24-35mm f/2 DG HSM | A"},
-            {249, "Canon EF 800mm f/5.6L IS"},
-            {250, "Canon EF 24mm f/1.4L II or Sigma Lens"},
+            {249, "Canon EF 800mm f/5.6L IS USM"},
+            {250, "Canon EF 24mm f/1.4L II USM or Sigma Lens"},
             {250, "Sigma 20mm f/1.4 DG HSM | A"},
             {251, "Canon EF 70-200mm f/2.8L IS II USM"},
             {252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"},
@@ -869,7 +869,7 @@ public:
             {492, "Canon EF 400mm f/2.8L IS II USM"},
             {493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"},
             {493, "Canon EF 24-105mm f/4L IS USM"},
-            {494, "Canon EF 600mm f/4.0L IS II USM"},
+            {494, "Canon EF 600mm f/4L IS II USM"},
             {495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens"},
             {495, "Sigma 24-70mm F2.8 DG OS HSM | A"},
             {496, "Canon EF 200-400mm f/4L IS USM"},
@@ -888,6 +888,7 @@ public:
             {750, "Canon EF 35mm f/1.4L II USM"},
             {751, "Canon EF 16-35mm f/2.8L III USM"},
             {752, "Canon EF 24-105mm f/4L IS II USM"},
+            {753, "Canon EF 85mm f/1.4L IS USM"},
             {4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"},
             {4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"},
             {4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
@@ -1702,6 +1703,7 @@ public:
         choices[68485120] = "PowerShot ELPH 185 / IXUS 185 / IXY 200";
         choices[68550656] = "PowerShot SX430 IS";
         choices[68616192] = "PowerShot SX730 HS";
+        choices[68681728] = "PowerShot G1 X Mark III";
         choices[100925440] = "PowerShot S100 / Digital IXUS / IXY Digital";
         choices[1074255475] = "DC19/DC21/DC22";
         choices[1074255476] = "XH A1";
diff --git a/rtexif/nikonattribs.cc b/rtexif/nikonattribs.cc
index cfdf61edb..3d844d2af 100644
--- a/rtexif/nikonattribs.cc
+++ b/rtexif/nikonattribs.cc
@@ -1032,9 +1032,11 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
     {"B4 40 37 62 2C 34 B6 0E", "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
     {"B5 4C 3C 3C 14 14 B7 06", "AF-S Nikkor 28mm f/1.8G"},
     {"B6 3C B0 B0 3C 3C B8 0E", "AF-S VR Nikkor 800mm f/5.6E FL ED"},
+    {"B6 3C B0 B0 3C 3C B8 4E", "AF-S VR Nikkor 800mm f/5.6E FL ED"},
     {"B6 48 37 56 24 24 1C 02", "Sigma 24-60mm f/2.8 EX DG"},
     {"B7 44 60 98 34 3C B9 0E", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
     {"B8 40 2D 44 2C 34 BA 06", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
+    {"BF 3C 1B 1B 30 30 01 04", "Irix 11mm f/4 Firefly"},
     {"BF 4E 26 26 1E 1E 01 04", "Irix 15mm f/2.4 Firefly"},
     {"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
     {"CC 4C 50 68 14 14 4B 06", "Sigma 50-100mm f/1.8 DC HSM | A"},
@@ -1045,6 +1047,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
     {"DE 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 EX DG HSM"},
     {"E0 3C 5C 8E 30 3C 4B 06", "Sigma 70-300mm f/4-5.6 APO DG Macro HSM"},
     {"E1 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
+    {"E3 40 76 A6 38 40 DF 4E", "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
     {"E3 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
     {"E4 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F017)"},
     {"E5 54 6A 6A 24 24 35 02", "Sigma Macro 105mm f/2.8 EX DG"},
diff --git a/rtexif/olympusattribs.cc b/rtexif/olympusattribs.cc
index 21cfb5738..13982dda0 100644
--- a/rtexif/olympusattribs.cc
+++ b/rtexif/olympusattribs.cc
@@ -125,7 +125,9 @@ public:
         lenses["00 26 10"] = "Olympus M.Zuiko Digital ED 12-100mm f/4.0 IS Pro";
         lenses["00 27 10"] = "Olympus M.Zuiko Digital ED 30mm f/3.5 Macro";
         lenses["00 28 10"] = "Olympus M.Zuiko Digital ED 25mm f/1.2 Pro";
+        lenses["00 29 10"] = "Olympus M.Zuiko Digital ED 17mm f/1.2 Pro";
         lenses["00 30 00"] = "Olympus Zuiko Digital ED 50-200mm f/2.8-3.5 SWD";
+        lenses["00 30 10"] = "Olympus M.Zuiko Digital ED 45mm f/1.2 Pro";
         lenses["00 31 00"] = "Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD";
         lenses["00 32 00"] = "Olympus Zuiko Digital ED 14-35mm f/2.0 SWD";
         lenses["00 33 00"] = "Olympus Zuiko Digital 25mm f/2.8";
diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc
index 7444e7212..c7252d360 100644
--- a/rtexif/pentaxattribs.cc
+++ b/rtexif/pentaxattribs.cc
@@ -783,6 +783,7 @@ public:
         choices.insert (p_t (256 * 4 + 2, "smc PENTAX-FA 80-320mm f/4.5-5.6"));
         choices.insert (p_t (256 * 4 + 3, "smc PENTAX-FA 43mm f/1.9 Limited"));
         choices.insert (p_t (256 * 4 + 6, "smc PENTAX-FA 35-80mm f/4-5.6"));
+        choices.insert (p_t (256 * 4 + 9, "Irix 11mm f/4 Firefly"));
         choices.insert (p_t (256 * 4 + 10, "Irix 15mm f/2.4"));
         choices.insert (p_t (256 * 4 + 12, "smc PENTAX-FA 50mm f/1.4"));
         choices.insert (p_t (256 * 4 + 15, "smc PENTAX-FA 28-105mm f/4-5.6 [IF]"));
@@ -928,7 +929,7 @@ public:
         choices.insert (p_t (256 * 8 + 30, "Sigma 17-70mm f/2.8-4 DC Macro HSM | C"));
         choices.insert (p_t (256 * 8 + 31, "Sigma 18-35mm f/1.8 DC HSM"));
         choices.insert (p_t (256 * 8 + 32, "Sigma 30mm f/1.4 DC HSM | A"));
-        choices.insert (p_t (256 * 8 + 33, "Sigma 18-200mm f/3.5-6.3 DC MACRO HSM"));
+        choices.insert (p_t (256 * 8 + 33, "Sigma 18-200mm f/3.5-6.3 DC Macro HSM"));
         choices.insert (p_t (256 * 8 + 34, "Sigma 18-300mm f/3.5-6.3 DC Macro HSM"));
         choices.insert (p_t (256 * 8 + 59, "HD PENTAX-D FA 150-450mm f/4.5-5.6 ED DC AW"));
         choices.insert (p_t (256 * 8 + 60, "HD PENTAX-D FA* 70-200mm f/2.8 ED DC AW"));
diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc
index 083affa72..eede4f0fc 100644
--- a/rtexif/sonyminoltaattribs.cc
+++ b/rtexif/sonyminoltaattribs.cc
@@ -693,6 +693,7 @@ public:
             {216, "Tamron SP 45mm f/1.8 Di USD"},
             {217, "Tamron SP 35mm f/1.8 Di USD"},
             {218, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD (F017)"},
+            {220, "Tamron SP 150-600mm f/5-6.3 Di USD G2"},
             {224, "Tamron SP 90mm f/2.8 Di Macro 1:1 USD (F004)"},
             {255, "Tamron Lens (255)"},
             {255, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical"},
@@ -745,6 +746,7 @@ public:
             {2561, "Tokina AF 730 II 75-300mm f/4.5-5.6"},
             {2561, "Sigma 800mm f/5.6 APO"},
             {2561, "Sigma AF 400mm f/5.6 APO Macro"},
+            {2561, "Sigma 1000mm f/8 APO"},
             {2562, "Minolta AF 50mm f/1.4 [New]"},
             {2563, "Minolta AF 300mm f/2.8 APO or Sigma Lens"},
             {2563, "Sigma AF 50-500mm f/4-6.3 EX DG APO"},
@@ -849,6 +851,7 @@ public:
             {6553, "Sony FE 12-24mm f/4 G"},
             {6553, "Sony FE 90mm f/2.8 Macro G OSS"},
             {6553, "Sony E 18-50mm f/4-5.6"},
+            {6553, "Sony FE 24-105mm f/4 G OSS"},
             {6553, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
             {6553, "Sony FE 55mm f/1.8 ZA"},
             {6553, "Sony FE 70-200mm f/4 G OSS"},
@@ -871,6 +874,7 @@ public:
             {6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
             {6553, "Sony FE 70-200mm f/2.8 GM OSS"},
             {6553, "Sony FE 16-35mm f/2.8 GM"},
+            {6553, "Sony E 18-135mm f/3.5-5.6 OSS"},
             {6553, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
             {6553, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
             {6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
@@ -882,6 +886,7 @@ public:
             {6553, "Sigma 30mm f/2.8 [EX] DN"},
             {6553, "Sigma 60mm f/2.8 DN"},
             {6553, "Sigma 30mm f/1.4 DC DN | C"},
+            {6553, "Sigma 16mm f/1.4 DC DN | C"},
             {6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
             {6553, "Tokina Firin 20mm f/2 FE MF"},
             {6553, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
@@ -948,6 +953,7 @@ public:
             {25611, "Tokina AF 730 II 75-300mm f/4.5-5.6"},
             {25611, "Sigma 800mm f/5.6 APO"},
             {25611, "Sigma AF 400mm f/5.6 APO Macro"},
+            {25611, "Sigma 1000mm f/8 APO"},
             {25621, "Minolta AF 50mm f/1.4 [New]"},
             {25631, "Minolta AF 300mm f/2.8 APO or Sigma Lens"},
             {25631, "Sigma AF 50-500mm f/4-6.3 EX DG APO"},
@@ -1052,6 +1058,7 @@ public:
             {65535, "Sony FE 12-24mm f/4 G"},
             {65535, "Sony FE 90mm f/2.8 Macro G OSS"},
             {65535, "Sony E 18-50mm f/4-5.6"},
+            {65535, "Sony FE 24-105mm f/4 G OSS"},
             {65535, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
             {65535, "Sony FE 55mm f/1.8 ZA"},
             {65535, "Sony FE 70-200mm f/4 G OSS"},
@@ -1074,6 +1081,7 @@ public:
             {65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
             {65535, "Sony FE 70-200mm f/2.8 GM OSS"},
             {65535, "Sony FE 16-35mm f/2.8 GM"},
+            {65535, "Sony E 18-135mm f/3.5-5.6 OSS"},
             {65535, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
             {65535, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
             {65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
@@ -1085,6 +1093,7 @@ public:
             {65535, "Sigma 30mm f/2.8 [EX] DN"},
             {65535, "Sigma 60mm f/2.8 DN"},
             {65535, "Sigma 30mm f/1.4 DC DN | C"},
+            {65535, "Sigma 16mm f/1.4 DC DN | C"},
             {65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
             {65535, "Tokina Firin 20mm f/2 FE MF"},
             {65535, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
@@ -1183,6 +1192,7 @@ public:
         choices.insert (p_t (32801, "Sony FE 12-24mm f/4 G"));
         choices.insert (p_t (32802, "Sony FE 90mm f/2.8 Macro G OSS"));
         choices.insert (p_t (32803, "Sony E 18-50mm f/4-5.6"));
+        choices.insert (p_t (32805, "Sony FE 24-105mm f/4 G OSS"));
         choices.insert (p_t (32807, "Sony E PZ 18-200mm f/3.5-6.3 OSS"));
         choices.insert (p_t (32808, "Sony FE 55mm f/1.8 ZA"));
         choices.insert (p_t (32810, "Sony FE 70-200mm f/4 G OSS"));
@@ -1205,7 +1215,7 @@ public:
         choices.insert (p_t (32829, "Sony FE 100-400mm f/4.5-5.6 GM OSS"));
         choices.insert (p_t (32830, "Sony FE 70-200mm f/2.8 GM OSS"));
         choices.insert (p_t (32831, "Sony FE 16-35mm f/2.8 GM"));
-        choices.insert (p_t (33002, "Sigma 85mm f/1.4 DG HSM | A (+ Metabones Ver.50)"));
+        choices.insert (p_t (32849, "Sony E 18-135mm f/3.5-5.6 OSS"));
         choices.insert (p_t (33072, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"));
         choices.insert (p_t (33073, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"));
         choices.insert (p_t (33076, "Sony FE 100mm f/2.8 STF GM OSS (macro mode)"));
@@ -1235,6 +1245,7 @@ public:
         choices.insert (p_t (50492, "Sigma 24-105mm f/4 DG OS HSM | A + MC-11"));
         choices.insert (p_t (50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C + MC-11"));
         choices.insert (p_t (50495, "Sigma 50-100mm f/1.8 DC HSM | A + MC-11"));
+        choices.insert (p_t (50503, "Sigma 16mm f/1.4 DC DN | C"));
         choices.insert (p_t (50992, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"));
         choices.insert (p_t (50993, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"));
         choices.insert (p_t (50994, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"));
diff --git a/tools/generateRtexifUpdates b/tools/generateRtexifUpdates
index cdc0dd70c..72a97862e 100755
--- a/tools/generateRtexifUpdates
+++ b/tools/generateRtexifUpdates
@@ -29,30 +29,58 @@ fi
 mkdir -p "$tmpdir" || { printf '%s\n' "Error creating $tmpdir" ""; exit 1; }
 echo
 
+#------------------------------------------------------------------------------
 # Canon
 printf '%s\n' "Saving ${tmpdir}/canon_lenses"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_lenses"
-sed -r -i -e '/-1\tn\/a/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/        choices.insert (p_t (/' -e 's/$/"));/' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/canon_lenses"
-# xmlstarlet sel -T -t -m "taginfo/table/tag[@name='EasyMode']/values/key" -v "concat(@id,'  ',val)" -n < <(exiftool -listx -canon:all) | sed -r -e '/-1\tn\/a/d' -e 's/([0-9]+)[0-9.]*\t/\1] = "/' -e 's/^/        choices[/' -e 's/$/";/'
+
+#In :10.1    Sigma 50mm f/2.8 EX
+#Out:            {10, "Sigma 50mm f/2.8 EX"},
+# delete lines matching '-1<tab>n/a'
+# replace '10.1<tab>Sigma' with '10, "Sigma'
+# prepend whitespace
+# append closing braces
+# replace ' F/11' with ' f/11'
+sed -r -i \
+    -e '/-1\tn\/a/d' \
+    -e 's/([0-9]+)[0-9.]*\t/\1, "/' \
+    -e 's/^/            {/' \
+    -e 's/$/"},/' \
+    -e 's| F/([0-9]+)| f/\1|' \
+    "${tmpdir}/canon_lenses"
+
+#In :16842752        PowerShot A30
+#Out:        choices[16842752] = "PowerShot A30";
+# prepend whitespace and 'choices['
+# replace <tab> with '] = "'
+# append '";'
 printf '%s\n' "Saving ${tmpdir}/canon_cameras"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='CanonModelID']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_cameras"
-sed -r -i -e 's/^/        choices[/' -e 's/\t/] = "/' -e 's/$/";/' "${tmpdir}/canon_cameras"
+sed -r -i \
+    -e 's/^/        choices[/' \
+    -e 's/\t/] = "/' \
+    -e 's/$/";/' \
+    "${tmpdir}/canon_cameras"
 
+#------------------------------------------------------------------------------
 # Nikon LensIDs are composite tags
 printf '%s\n' "Saving ${tmpdir}/nikon"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensID']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -composite:all) > "${tmpdir}/nikon"
 sed -r -i -e '/^...	/d' -e 's/^/    {"/' -e 's/([A-F0-9]+)[A-F0-9.]*\t/\1", "/' -e 's/$/"},/' -e 's|(.* ")(.*) F([0-9]+)|\1\2 f/\3|' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/nikon"
 
+#------------------------------------------------------------------------------
 # Olympus
 printf '%s\n' "Saving ${tmpdir}/olympus"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -olympus:all) | sort -fuV > "${tmpdir}/olympus"
 sed -r -i -e '/0 00 00\tNone/d' -e 's/^/        lenses["0/' -e 's/\t/"] = "/' -e 's/$/";/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/olympus"
 
+#------------------------------------------------------------------------------
 # Pentax
 printf '%s\n' "Saving ${tmpdir}/pentax"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -pentax:all) | sort -fuV > "${tmpdir}/pentax"
 sed -r -i -e 's/^/        choices.insert (p_t (256 * /' -e 's/([0-9]+) ([0-9]+)([0-9.]*)/\1 + \2/' -e 's/\t/, "/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|' "${tmpdir}/pentax"
 
+#------------------------------------------------------------------------------
 # Sony
 printf '%s\n' "Saving ${tmpdir}/sony"
 xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony"