diff --git a/ports/restinio/fix-cmake-config.diff b/ports/restinio/fix-cmake-config.diff
new file mode 100644
index 00000000000..fc398dfd5a5
--- /dev/null
+++ b/ports/restinio/fix-cmake-config.diff
@@ -0,0 +1,12 @@
+diff --git a/dev/restinio/cmake/restinio-config.cmake.in b/dev/restinio/cmake/restinio-config.cmake.in
+index b8df667..02db4d8 100644
+--- a/dev/restinio/cmake/restinio-config.cmake.in
++++ b/dev/restinio/cmake/restinio-config.cmake.in
+@@ -1,3 +1,7 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(unofficial-http-parser)
++find_dependency(fmt)
++
+ include(${CMAKE_CURRENT_LIST_DIR}/restinio-targets.cmake)
diff --git a/ports/restinio/fix-project.diff b/ports/restinio/fix-project.diff
new file mode 100644
index 00000000000..eff08ef1d94
--- /dev/null
+++ b/ports/restinio/fix-project.diff
@@ -0,0 +1,10 @@
+diff --git a/vcpkg/CMakeLists.txt b/vcpkg/CMakeLists.txt
+index 2c36cda..be3d6ce 100644
+--- a/vcpkg/CMakeLists.txt
++++ b/vcpkg/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required(VERSION 3.3)
++project(restinio-vcpkg CXX)
+ 
+ SET(CMAKE_CXX_STANDARD 14)
+ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake
index 5b8feba2689..dc8c3263dab 100644
--- a/ports/restinio/portfile.cmake
+++ b/ports/restinio/portfile.cmake
@@ -1,17 +1,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/restinio
-    REF a5b668560138da42158511880470b19988566568 # v.0.6.17
-    SHA512 fc3cdab9c240ba30b5f4b800ec452442a38db93936d3f7557255e6e7e3176217413fa421afec8b155cfb498df5ca9fc48a74a8e9bf1903aa31c9824d26d9618c
+    REF "v.${VERSION}"
+    SHA512 8a535ebcdfb53ef9f669bbd007d11b6d95bae87b1a8b8403556910e4904483bfcaeb88fa2ee5522c9bef048a9276cbdb1fa15ec62b5bd158fc585b0e84cf046b
+    PATCHES
+        fix-cmake-config.diff
+        fix-project.diff
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/vcpkg"
 )
-
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json
index 41353f5e218..d057f885932 100644
--- a/ports/restinio/vcpkg.json
+++ b/ports/restinio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "restinio",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.",
   "homepage": "https://github.com/Stiffstream/restinio",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3361e8535e6..ff0f5a87b8a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6945,7 +6945,7 @@
       "port-version": 0
     },
     "restinio": {
-      "baseline": "0.6.17",
+      "baseline": "0.6.18",
       "port-version": 0
     },
     "rexo": {
diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json
index 8e177cb7171..bd86a8ad5d0 100644
--- a/versions/r-/restinio.json
+++ b/versions/r-/restinio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f749e69b703a537f74f52fcef9327950e7d56ea9",
+      "version": "0.6.18",
+      "port-version": 0
+    },
     {
       "git-tree": "7b285cfa0e43e1964ca4a91d2375516aa8121d79",
       "version": "0.6.17",