diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
index c0263959b3..23b9feb5c5 100644
--- a/src/makernote_int.cpp
+++ b/src/makernote_int.cpp
@@ -873,6 +873,7 @@ constexpr auto nikonArrayIdx = std::array{
     NikonArrayIdx{0x0098, "0203", 0, 1, 4}, NikonArrayIdx{0x0098, "0204", 0, 2, 4},
     NikonArrayIdx{0x0098, "0800", 0, 3, 4},  // for e.g. Z6/7
     NikonArrayIdx{0x0098, "0801", 0, 3, 4},  // for e.g. Z6/7
+    NikonArrayIdx{0x0098, "0802", 0, 3, 4},  // for e.g. Z9
     // NikonFl
     NikonArrayIdx{0x00a8, "0100", 0, 0, NA}, NikonArrayIdx{0x00a8, "0101", 0, 0, NA},
     NikonArrayIdx{0x00a8, "0102", 0, 1, NA}, NikonArrayIdx{0x00a8, "0103", 0, 2, NA},
diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
index ea3fb38d92..b40e870fa3 100644
--- a/src/nikonmn_int.cpp
+++ b/src/nikonmn_int.cpp
@@ -3337,7 +3337,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
     return os << "(" << value << ")";
   }
 
-  // from https://github.com/exiftool/exiftool/blob/12.12/lib/Image/ExifTool/Nikon.pm#L4646
+  // from https://github.com/exiftool/exiftool/blob/12.44/lib/Image/ExifTool/Nikon.pm#L4969
   using ZMntLens = std::tuple<uint16_t, const char*, const char*>;
   static constexpr auto zmountlens = std::array{
       ZMntLens(1, "Nikon", "Nikkor Z 24-70mm f/4 S"),
@@ -3349,13 +3349,20 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
       ZMntLens(12, "Nikon", "Nikkor Z DX 50-250mm f/4.5-6.3 VR"),
       ZMntLens(13, "Nikon", "Nikkor Z 24-70mm f/2.8 S"),
       ZMntLens(14, "Nikon", "Nikkor Z 85mm f/1.8 S"),
-      ZMntLens(15, "Nikon", "Nikkor Z 24mm f/1.8 S"),         // IB
-      ZMntLens(16, "Nikon", "Nikkor Z 70-200mm f/2.8 VR S"),  // IB
-      ZMntLens(17, "Nikon", "Nikkor Z 20mm f/1.8 S"),         // IB
-      ZMntLens(18, "Nikon", "Nikkor Z 24-200mm f/4-6.3 VR"),  // IB
-      ZMntLens(21, "Nikon", "Nikkor Z 50mm f/1.2 S"),         // IB
-      ZMntLens(22, "Nikon", "Nikkor Z 24-50mm f/4-6.3"),      // IB
-      ZMntLens(23, "Nikon", "Nikkor Z 14-24mm f/2.8 S"),      // IB
+      ZMntLens(15, "Nikon", "Nikkor Z 24mm f/1.8 S"),              // IB
+      ZMntLens(16, "Nikon", "Nikkor Z 70-200mm f/2.8 VR S"),       // IB
+      ZMntLens(17, "Nikon", "Nikkor Z 20mm f/1.8 S"),              // IB
+      ZMntLens(18, "Nikon", "Nikkor Z 24-200mm f/4-6.3 VR"),       // IB
+      ZMntLens(21, "Nikon", "Nikkor Z 50mm f/1.2 S"),              // IB
+      ZMntLens(22, "Nikon", "Nikkor Z 24-50mm f/4-6.3"),           // IB
+      ZMntLens(23, "Nikon", "Nikkor Z 14-24mm f/2.8 S"),           // IB
+      ZMntLens(24, "Nikon", "Nikkor Z MC 105mm f/2.8 VR S"),       // IB
+      ZMntLens(27, "Nikon", "Nikkor Z MC 50mm f/2.8"),             // IB
+      ZMntLens(28, "Nikon", "Nikkor Z 100-400mm f/4.5-5.6 VR S"),  // 28
+      ZMntLens(29, "Nikon", "Nikkor Z 28mm f/2.8"),                // IB
+      ZMntLens(30, "Nikon", "Nikkor Z 400mm f/2.8 TC VR S"),       // 28
+      ZMntLens(31, "Nikon", "Nikkor Z 24-120 f/4"),                // 28
+      ZMntLens(32, "Nikon", "Nikkor Z 800mm f/6.3 VR S"),          // 28
   };
 
   auto lid = static_cast<uint16_t>(value.toInt64());