diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
index 1c8b47b1..b65c9a50 100644
--- a/src/nikonmn_int.cpp
+++ b/src/nikonmn_int.cpp
@@ -2464,6 +2464,7 @@ fmountlens[] = {
 {0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"},
 {0x7A,0x48,0x1C,0x29,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 116 PRO DX II (AF 11-16mm f/2.8)"},
 {0x7A,0x48,0x1C,0x30,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)"},
+{0x8B,0x48,0x1C,0x30,0x24,0x24,0x85,0x06,0x00,0x00,0x00, "Tokina", "", "ATX-i 11-20mm F2.8 CF"},
 {0x94,0x54,0x24,0x30,0x18,0x18,0x4a,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 14-20 F2 PRO DX"},
 {0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
 {0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x00, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
diff --git a/test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv b/test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv
new file mode 100644
index 00000000..f193b3ea
Binary files /dev/null and b/test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv differ
diff --git a/tests/bugfixes/github/test_pr_2072.py b/tests/bugfixes/github/test_pr_2072.py
new file mode 100644
index 00000000..7a96c12e
--- /dev/null
+++ b/tests/bugfixes/github/test_pr_2072.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+class NikonTokinaLens_ATX_i_11_20mm_F2_8_CF(metaclass=system_tests.CaseMeta):
+    url = "https://github.com/Exiv2/exiv2/pull/2072"
+    
+    filename = "$data_path/Tokina_ATX-i_11-20mm_F2.8_CF.exv"
+    commands = ["$exiv2 -pa --grep lensid/i $filename"]
+    stderr = [""]
+    stdout = ["Exif.NikonLd3.LensIDNumber                   Byte        1  Tokina ATX-i 11-20mm F2.8 CF\n"]
+    retval = [0]