diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake
index 6dbe24e074cfd2..feec2312c1ce91 100644
--- a/ports/mesa/portfile.cmake
+++ b/ports/mesa/portfile.cmake
@@ -134,4 +134,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()
 endif()
 
+if(FEATURES STREQUAL "core")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/license.rst")
diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json
index 14652411688d8b..b652de2bf5d458 100644
--- a/ports/mesa/vcpkg.json
+++ b/ports/mesa/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mesa",
   "version": "23.0.1",
+  "port-version": 1,
   "description": "Mesa - The 3D Graphics Library",
   "homepage": "https://www.mesa3d.org/",
   "license": "MIT AND BSL-1.0 AND SGI-B-2.0",
@@ -111,7 +112,16 @@
       ]
     },
     "offscreen": {
-      "description": "Build with support for offscreen rendering (OSMesa)"
+      "description": "Build with support for offscreen rendering (OSMesa)",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ]
+        }
+      ]
     },
     "opengl": {
       "description": "Build support for OpenGL (all versions)",
diff --git a/versions/baseline.json b/versions/baseline.json
index 80810a20869b48..8709160750dca2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5102,7 +5102,7 @@
     },
     "mesa": {
       "baseline": "23.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "meschach": {
       "baseline": "1.2b",
diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json
index df8cab3121592c..4d9607091924cd 100644
--- a/versions/m-/mesa.json
+++ b/versions/m-/mesa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca",
+      "version": "23.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "87fb0741a264517b99f37f4ff2ba43264cdfe0f9",
       "version": "23.0.1",