diff --git a/ports/meshoptimizer/portfile.cmake b/ports/meshoptimizer/portfile.cmake
index f72d3e493412b6..be2732b1c894c2 100644
--- a/ports/meshoptimizer/portfile.cmake
+++ b/ports/meshoptimizer/portfile.cmake
@@ -1,17 +1,23 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeux/meshoptimizer
-    REF v0.16
-    SHA512 CC6D28359FB99A615E1046A4AF1B247CBC6EA0266D9E7F41EA0516C1FC09FA1E67376071DAF138A126C77BCA3BAF9D565636ED0E3ADF045F1A08498C38B7A7E7
+    REF v0.18
+    SHA512 b9fd6ce61c7d7b673892ace74feb300628d4bbbba4e912dba4a756d9709b952dde45b706c581df3fd0aef1e7065ff730d1827b0d6c724d716ccf41efb1953d3e
     HEAD_REF master
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+  gltfpack  MESHOPT_BUILD_GLTFPACK
+)
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DMESHOPT_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+      ${FEATURE_OPTIONS}
+      -DMESHOPT_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
 )
 
 vcpkg_cmake_install()
@@ -20,6 +26,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/meshoptimizer)
 
+if ("gltfpack" IN_LIST FEATURES)
+  vcpkg_copy_tools(TOOL_NAMES gltfpack AUTO_CLEAN)
+endif()
+
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json
index 7124de0788bd9c..fa30bf9d28d0af 100644
--- a/ports/meshoptimizer/vcpkg.json
+++ b/ports/meshoptimizer/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "meshoptimizer",
-  "version": "0.16",
+  "version": "0.18",
   "description": "Mesh optimization library that makes meshes smaller and faster to render",
   "homepage": "https://github.com/zeux/meshoptimizer",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -12,5 +13,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "gltfpack": {
+      "description": "Build gltfpack tool"
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 4a83e07b5286a4..7ce91e65668417 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4741,7 +4741,7 @@
       "port-version": 5
     },
     "meshoptimizer": {
-      "baseline": "0.16",
+      "baseline": "0.18",
       "port-version": 0
     },
     "metis": {
diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json
index 57964ad9deb119..41a09ec38a8da6 100644
--- a/versions/m-/meshoptimizer.json
+++ b/versions/m-/meshoptimizer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc06ee0eb1b2510c67f2bf0d6940fd10395990a4",
+      "version": "0.18",
+      "port-version": 0
+    },
     {
       "git-tree": "a1693991d70ae383ea21f4f634f8d0f136e15bd7",
       "version": "0.16",