diff --git a/ports/libraw/install-interface.patch b/ports/libraw/install-interface.patch
new file mode 100644
index 0000000000..065df7586d
--- /dev/null
+++ b/ports/libraw/install-interface.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 484e76b..adbcd10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,6 +111,9 @@ if(MSVC)
+     add_definitions(-D_AFX_SECURE_NO_WARNINGS)
+ endif()
+ 
++# For variables in $<INSTALL_INTERFACE:...>
++include(GNUInstallDirs)
++
+ # -- Check dependencies --------------------------------------------------------------------------------
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
+@@ -489,7 +492,7 @@ endif()
+ 
+ target_include_directories(raw
+         PUBLIC
+-            $<INSTALL_INTERFACE:libraw>
++            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
+             $<BUILD_INTERFACE:${LIBRAW_PATH}>)
+ 
+ target_link_libraries(raw PUBLIC ${MATH_LIBRARY})
+@@ -558,7 +561,7 @@ set_target_properties(raw_r PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(raw_r PUBLIC ${MATH_LIBRARY})
+ target_include_directories(raw_r
+         PUBLIC
+-        $<INSTALL_INTERFACE:libraw>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
+         $<BUILD_INTERFACE:${LIBRAW_PATH}>)
+ 
+ if(WIN32)
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake
index 4969ed4666..33efb2361a 100644
--- a/ports/libraw/portfile.cmake
+++ b/ports/libraw/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         dependencies.patch
+        install-interface.patch
         # Move the non-thread-safe library to manual-link. This is unfortunately needed
         # because otherwise libraries that build on top of libraw have to choose.
         fix-install.patch
diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json
index cfcb8fed9b..b501d9b190 100644
--- a/ports/libraw/vcpkg.json
+++ b/ports/libraw/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libraw",
   "version": "0.21.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "raw image decoder library",
   "homepage": "https://www.libraw.org",
   "license": "LGPL-2.1-only OR CDDL-1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4ff31a2a9f..ad169f2f67 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4522,7 +4522,7 @@
     },
     "libraw": {
       "baseline": "0.21.1",
-      "port-version": 1
+      "port-version": 2
     },
     "librdkafka": {
       "baseline": "2.2.0",
diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json
index 299b525d4e..3259e9b058 100644
--- a/versions/l-/libraw.json
+++ b/versions/l-/libraw.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca8608b21d32cbd238b21eafc1ceb19ab91729b5",
+      "version": "0.21.1",
+      "port-version": 2
+    },
     {
       "git-tree": "1b27d2a7401506c017a98e896c3dee2db0a01bfa",
       "version": "0.21.1",