diff --git a/ports/raylib/fix-linkGlfw.patch b/ports/raylib/fix-linkGlfw.patch
new file mode 100644
index 00000000000000..d495e281462229
--- /dev/null
+++ b/ports/raylib/fix-linkGlfw.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake
+index 1b94cdf..4cc8f8f 100644
+--- a/cmake/GlfwImport.cmake
++++ b/cmake/GlfwImport.cmake
+@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE")
+     find_package(glfw3 3.3.3 QUIET)
+ endif()
+ if (glfw3_FOUND)
+-    set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
++    set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3)
+ endif()
+
+ # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option
+@@ -32,3 +32,4 @@ else()
+     MESSAGE(STATUS "Using external GLFW")
+     set(GLFW_PKG_DEPS glfw3)
+ endif()
++set(GLFW_PKG_DEPS glfw3)
+diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake
+index c156d6b..55c5bca 100644
+--- a/cmake/LibraryConfigurations.cmake
++++ b/cmake/LibraryConfigurations.cmake
+@@ -104,5 +104,5 @@ endif ()
+ set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY})
+
+ if (${PLATFORM} MATCHES "Desktop")
+-    set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
++    set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3)
+ endif ()
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake
index 03434d92ebd4dd..96a0298d42d527 100644
--- a/ports/raylib/portfile.cmake
+++ b/ports/raylib/portfile.cmake
@@ -10,12 +10,17 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li
     )
 endif()
 
+if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
+    set(patches fix-linkGlfw.patch)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO raysan5/raylib
     REF 4.0.0
     SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417
     HEAD_REF master
+    PATCHES ${patches}
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
@@ -34,8 +39,7 @@ else()
 endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_EXAMPLES=OFF
         -DBUILD_GAMES=OFF
diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json
index 4732c3d41c48f0..348eb943e668e7 100644
--- a/ports/raylib/vcpkg.json
+++ b/ports/raylib/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "raylib",
   "version-semver": "4.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A simple and easy-to-use library to enjoy videogames programming",
   "homepage": "https://github.com/raysan5/raylib",
   "license": "Zlib",
   "supports": "!(arm | uwp)",
   "dependencies": [
+    {
+      "name": "glfw3",
+      "platform": "!windows"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/versions/baseline.json b/versions/baseline.json
index 92a076b2318101..695acff7ee7a35 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6022,7 +6022,7 @@
     },
     "raylib": {
       "baseline": "4.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "rbdl": {
       "baseline": "2.6.0",
diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json
index 82e0effffcd1d2..91b54dde0c2ac4 100644
--- a/versions/r-/raylib.json
+++ b/versions/r-/raylib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743",
+      "version-semver": "4.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9",
       "version-semver": "4.0.0",