diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
index 71ff272e..98bf9224 100644
--- a/src/nikonmn_int.cpp
+++ b/src/nikonmn_int.cpp
@@ -2538,6 +2538,8 @@ fmountlens[] = {
 {0xCF,0x47,0x5C,0x8E,0x31,0x3D,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A030", "SP 70-300mm F/4-5.6 Di VC USD"},
 //
 {0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"},
+// https://github.com/Exiv2/exiv2/issues/1078
+{0x80,0x48,0x1C,0x29,0x24,0x24,0x7A,0x06,0x00,0x00,0x00, "Tokina", "", "atx-i 11-16mm F2.8 CF"},
 //
 {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL}
 };
diff --git a/test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv b/test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv
new file mode 100644
index 00000000..8940e14d
Binary files /dev/null and b/test/data/Tokina_atx-i_11-16mm_F2.8_CF.exv differ
diff --git a/tests/bugfixes/github/test_issue_1078.py b/tests/bugfixes/github/test_issue_1078.py
new file mode 100644
index 00000000..c9359ee6
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_1078.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+class NikonTokinaLens_atx_i_11_16_F28(metaclass=system_tests.CaseMeta):
+    url = "https://github.com/Exiv2/exiv2/issues/1078"
+
+    filename = "$data_path/Tokina_atx-i_11-16mm_F2.8_CF.exv"
+    commands = ["$exiv2 -pa --grep lensid/i $filename"]
+    stderr = [""]
+    stdout = [""
+        """Exif.NikonLd3.LensIDNumber                   Byte        1  Tokina atx-i 11-16mm F2.8 CF
+"""
+]
+    retval = [0]