diff --git a/ports/librabbitmq/fix-link-header-files.patch b/ports/librabbitmq/fix-link-header-files.patch
new file mode 100644
index 00000000000000..3590736cbb6a80
--- /dev/null
+++ b/ports/librabbitmq/fix-link-header-files.patch
@@ -0,0 +1,41 @@
+diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
+index 671840b..b46614c 100644
+--- a/librabbitmq/CMakeLists.txt
++++ b/librabbitmq/CMakeLists.txt
+@@ -112,11 +112,25 @@ add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
+ 
+ set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
+ 
++set(PUBLIC_INCLUDE_DIRS
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++  $<INSTALL_INTERFACE:include>
++)
++
++set(PRIVATE_INCLUDE_DIRS
++  ${CMAKE_CURRENT_BINARY_DIR}
++)
++
+ if (BUILD_SHARED_LIBS)
+     add_library(rabbitmq SHARED ${RABBITMQ_SOURCES})
+ 
+     target_link_libraries(rabbitmq ${RMQ_LIBRARIES})
+ 
++    target_include_directories(rabbitmq
++      PUBLIC ${PUBLIC_INCLUDE_DIRS}
++      PRIVATE ${PRIVATE_INCLUDE_DIRS}
++    )
+     if (WIN32)
+         set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION})
+     else (WIN32)
+@@ -137,6 +151,10 @@ if (BUILD_STATIC_LIBS)
+ 
+     target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES})
+ 
++    target_include_directories(rabbitmq-static
++      PUBLIC ${PUBLIC_INCLUDE_DIRS}
++      PRIVATE ${PRIVATE_INCLUDE_DIRS}
++    )
+     set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC)
+     if (WIN32)
+         set_target_properties(rabbitmq-static PROPERTIES
diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake
index ac8e6f5cba5cec..8ed28079f61903 100644
--- a/ports/librabbitmq/portfile.cmake
+++ b/ports/librabbitmq/portfile.cmake
@@ -6,10 +6,10 @@ vcpkg_from_github(
   HEAD_REF master
   PATCHES
       fix-uwpwarning.patch
+      fix-link-header-files.patch #Remove this patch in the next version
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
@@ -17,6 +17,7 @@ vcpkg_cmake_configure(
     -DBUILD_EXAMPLES=OFF
     -DBUILD_TESTS=OFF
     -DBUILD_TOOLS=OFF
+    -DBUILD_STATIC_LIBS=${BUILD_STATIC}
 )
 
 vcpkg_cmake_install()
diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json
index 9e8a333212428f..9824f012c27cef 100644
--- a/ports/librabbitmq/vcpkg.json
+++ b/ports/librabbitmq/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "librabbitmq",
   "version": "0.11.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.",
   "homepage": "https://github.com/alanxz/rabbitmq-c",
+  "license": "MIT",
   "dependencies": [
     "openssl",
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index bb54b660c8839e..67d2ff04ffb646 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3962,7 +3962,7 @@
     },
     "librabbitmq": {
       "baseline": "0.11.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libraqm": {
       "baseline": "0.9.0",
diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json
index 1184cdf7905eb2..aed7f16772c7b1 100644
--- a/versions/l-/librabbitmq.json
+++ b/versions/l-/librabbitmq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eaa23b49b84d0ec45e28645d78adc6c0b2f8faed",
+      "version": "0.11.0",
+      "port-version": 2
+    },
     {
       "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c",
       "version": "0.11.0",