diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
index 8a58b690a1..85b00ba25d 100644
--- a/ports/giflib/portfile.cmake
+++ b/ports/giflib/portfile.cmake
@@ -29,4 +29,6 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gif")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/giflib/usage b/ports/giflib/usage
new file mode 100644
index 0000000000..ebd07d1c12
--- /dev/null
+++ b/ports/giflib/usage
@@ -0,0 +1,4 @@
+The package giflib is compatible with built-in CMake targets:
+
+    find_package(GIF REQUIRED)
+    target_link_libraries(main PRIVATE GIF::GIF)
diff --git a/ports/giflib/vcpkg-cmake-wrapper.cmake b/ports/giflib/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 0000000000..8812b5ab17
--- /dev/null
+++ b/ports/giflib/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,25 @@
+find_path(GIF_INCLUDE_DIR NAMES gif_lib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
+find_library(GIF_LIBRARY_RELEASE NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+find_library(GIF_LIBRARY_DEBUG   NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+include(SelectLibraryConfigurations)
+select_library_configurations(GIF)
+set(GIF_LIBRARY "${GIF_LIBRARY}" CACHE STRING "")
+unset(GIF_LIBRARY)
+unset(GIF_FOUND)
+if(NOT TARGET GIF::GIF)
+    add_library(GIF::GIF UNKNOWN IMPORTED)
+    set_target_properties(GIF::GIF PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GIF_INCLUDE_DIR}"
+        IMPORTED_CONFIGURATIONS RELEASE
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${GIF_LIBRARY_RELEASE}"
+    )
+    if("${GIF_LIBRARY_DEBUG}")
+        set_property(TARGET GIF::GIF APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(GIF::GIF PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+            IMPORTED_LOCATION_DEBUG "${GIF_LIBRARY_DEBUG}")
+    endif()
+endif()
+_find_package(${ARGS})
diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json
index 2e950baed3..a13fa5811e 100644
--- a/ports/giflib/vcpkg.json
+++ b/ports/giflib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "giflib",
   "version": "5.2.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A library for reading and writing gif images.",
   "homepage": "https://sourceforge.net/projects/giflib/",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9e2877d724..ab367552b6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2610,7 +2610,7 @@
     },
     "giflib": {
       "baseline": "5.2.1",
-      "port-version": 2
+      "port-version": 3
     },
     "ginkgo": {
       "baseline": "1.4.0",
diff --git a/versions/g-/giflib.json b/versions/g-/giflib.json
index e9456f42e3..4992cc6876 100644
--- a/versions/g-/giflib.json
+++ b/versions/g-/giflib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8ba54b2de43f1fe619e5a7e554f108fc01a771da",
+      "version": "5.2.1",
+      "port-version": 3
+    },
     {
       "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb",
       "version": "5.2.1",