diff --git a/_changelog.md b/_changelog.md
index 519c1d4..61f4751 100644
--- a/_changelog.md
+++ b/_changelog.md
@@ -6,7 +6,12 @@
 
 ### Added
 
-- Added `image/avif` to binary types
+- Added JPEG2000 file format support
+
+
+### Fixed
+
+- Fixed AVIF file format support
 
 ---
 
@@ -14,7 +19,7 @@
 
 ### Added
 
-- Added `image/avif` to mime types
+- Added AVIF file format support
 
 ---
 
diff --git a/scripts/common-mime-type-list.js b/scripts/common-mime-type-list.js
index 076dda3..beb9131 100644
--- a/scripts/common-mime-type-list.js
+++ b/scripts/common-mime-type-list.js
@@ -72,6 +72,9 @@ module.exports = [
   'image/jp2',
   'image/jpeg',
   'image/jpg',
+  'image/jpg2',
+  'image/jpm',
+  'image/jpx',
   'image/pjpeg',
   'image/png',
   'image/svg+xml',
@@ -100,6 +103,7 @@ module.exports = [
   'text/x-vcalendar',
   'text/x-vcard',
   'text/xml',
+  'video/mj2',
   'video/mp4',
   'video/webm',
   'video/x-ms-asf',
diff --git a/src/lib/binary-extensions.js b/src/lib/binary-extensions.js
index 4415e42..72269cf 100644
--- a/src/lib/binary-extensions.js
+++ b/src/lib/binary-extensions.js
@@ -1,2 +1,2 @@
 // This file is auto-generated via npm run vendor
-module.exports = [ '3g2', '3gp', '3gpp', '7z', 'aif', 'aifc', 'aiff', 'au', 'avi', 'azw', 'bin', 'bmp', 'boz', 'bpk', 'buffer', 'bz', 'bz2', 'deb', 'deploy', 'dist', 'distz', 'dll', 'dmg', 'dms', 'doc', 'docx', 'dot', 'dump', 'ear', 'elc', 'epub', 'exe', 'gif', 'h264', 'heic', 'heics', 'heif', 'heifs', 'ico', 'img', 'iso', 'jar', 'jpe', 'jpeg', 'jpg', 'lrf', 'm1v', 'm2a', 'm2v', 'm3a', 'mar', 'mov', 'mp2', 'mp2a', 'mp3', 'mp4', 'mp4v', 'mpe', 'mpeg', 'mpg', 'mpg4', 'mpga', 'mpkg', 'msi', 'msm', 'msp', 'oga', 'ogg', 'ogv', 'opus', 'otf', 'pdf', 'pkg', 'png', 'pot', 'pps', 'ppt', 'pptx', 'qt', 'rar', 'rtf', 'snd', 'so', 'spx', 'tar', 'tif', 'tiff', 'ts', 'war', 'wav', 'webm', 'webp', 'woff', 'woff2', 'xla', 'xlc', 'xlm', 'xls', 'xlsx', 'xlt', 'xlw', 'zip' ]
+module.exports = [ '3g2', '3gp', '3gpp', '7z', 'aif', 'aifc', 'aiff', 'au', 'avi', 'avif', 'azw', 'bin', 'bmp', 'boz', 'bpk', 'buffer', 'bz', 'bz2', 'deb', 'deploy', 'dist', 'distz', 'dll', 'dmg', 'dms', 'doc', 'docx', 'dot', 'dump', 'ear', 'elc', 'epub', 'exe', 'gif', 'h264', 'heic', 'heics', 'heif', 'heifs', 'ico', 'img', 'iso', 'jar', 'jp2', 'jpe', 'jpeg', 'jpg', 'jpg2', 'lrf', 'm1v', 'm2a', 'm2v', 'm3a', 'mar', 'mj2', 'mjp2', 'mov', 'mp2', 'mp2a', 'mp3', 'mp4', 'mp4v', 'mpe', 'mpeg', 'mpg', 'mpg4', 'mpga', 'mpkg', 'msi', 'msm', 'msp', 'oga', 'ogg', 'ogv', 'opus', 'otf', 'pdf', 'pkg', 'png', 'pot', 'pps', 'ppt', 'pptx', 'qt', 'rar', 'rtf', 'snd', 'so', 'spx', 'tar', 'tif', 'tiff', 'ts', 'war', 'wav', 'webm', 'webp', 'woff', 'woff2', 'xla', 'xlc', 'xlm', 'xls', 'xlsx', 'xlt', 'xlw', 'zip' ]
diff --git a/src/lib/binary-types.js b/src/lib/binary-types.js
index 60f6271..9ef5110 100644
--- a/src/lib/binary-types.js
+++ b/src/lib/binary-types.js
@@ -21,11 +21,14 @@ module.exports = [
   'image/avif',
   'image/bmp',
   'image/gif',
-  'image/heic',
   'image/heic-sequence',
-  'image/heif',
+  'image/heic',
   'image/heif-sequence',
+  'image/heif',
+  'image/jp2',
   'image/jpeg',
+  'image/jpg',
+  'image/jpg2',
   'image/png',
   'image/tiff',
   'image/vnd.microsoft.icon',
@@ -41,13 +44,14 @@ module.exports = [
   'audio/x-midi',
   'audio/x-wav',
   // Video
+  'video/3gpp-tt',
   'video/3gpp',
   'video/3gpp2',
-  'video/3gpp-tt',
   'video/h264',
   'video/h265',
   'video/h266',
   'video/jpeg2000',
+  'video/mj2',
   'video/mp2t',
   'video/mp4',
   'video/mpeg',
diff --git a/src/lib/common-mime-types.js b/src/lib/common-mime-types.js
index 891b31b..bffce5e 100644
--- a/src/lib/common-mime-types.js
+++ b/src/lib/common-mime-types.js
@@ -88,6 +88,9 @@ module.exports = {
   jpeg: `${c}/jpeg`,
   jpg: `${c}/jpeg`,
   jpe: `${c}/jpeg`,
+  jpm: `${c}/jpm`,
+  jpx: `${c}/jpx`,
+  jpf: `${c}/jpx`,
   png: `${c}/png`,
   svg: `${c}/svg+xml`,
   svgz: `${c}/svg+xml`,
@@ -126,6 +129,8 @@ module.exports = {
   dic: `${f}/x-c`,
   vcs: `${f}/x-vcalendar`,
   vcf: `${f}/x-vcard`,
+  mj2: `${g}/mj2`,
+  mjp2: `${g}/mj2`,
   mp4: `${g}/mp4`,
   mp4v: `${g}/mp4`,
   mpg4: `${g}/mp4`,