diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt
index bedd2e5070..e9d4463595 100644
--- a/ports/libsodium/CMakeLists.txt
+++ b/ports/libsodium/CMakeLists.txt
@@ -44,6 +44,14 @@ if (ENABLE_MINIMAL)
     set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1")
 endif ()
 
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
+set(PACKAGE_NAME "${PROJECT_NAME}")
+set(PACKAGE_VERSION "${VERSION}")
+
 configure_file(
     src/libsodium/include/sodium/version.h.in
     ${CMAKE_BINARY_DIR}/sodium/version.h
@@ -1081,6 +1089,9 @@ if (BUILD_TESTING)
     endforeach ()
 endif ()
 
+configure_file ("${CMAKE_SOURCE_DIR}/libsodium.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libsodium.pc" @ONLY)
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libsodium.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+
 install(DIRECTORY src/libsodium/include/
     DESTINATION include/
     USE_SOURCE_PERMISSIONS
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index 934cf8cf79..4ff90b12f2 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jedisct1/libsodium
-    REF 1.0.18
+    REF ${VERSION}
     SHA512 727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb
     HEAD_REF master
 )
@@ -26,6 +26,7 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME unofficial-sodium
 )
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -40,4 +41,4 @@ configure_file(
     @ONLY
 )
 
-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/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json
index b4f0e9dea5..9af42f2bec 100644
--- a/ports/libsodium/vcpkg.json
+++ b/ports/libsodium/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libsodium",
   "version": "1.0.18",
-  "port-version": 8,
+  "port-version": 9,
   "description": "A modern and easy-to-use crypto library",
   "homepage": "https://github.com/jedisct1/libsodium",
   "license": "ISC",
diff --git a/versions/baseline.json b/versions/baseline.json
index 168f9edf28..be6d0774c7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4610,7 +4610,7 @@
     },
     "libsodium": {
       "baseline": "1.0.18",
-      "port-version": 8
+      "port-version": 9
     },
     "libsonic": {
       "baseline": "0.2.0",
diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json
index 9cf0250a35..48aadca12c 100644
--- a/versions/l-/libsodium.json
+++ b/versions/l-/libsodium.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6c75abf2ec95a8c9b498d2e18e9f854d75941048",
+      "version": "1.0.18",
+      "port-version": 9
+    },
     {
       "git-tree": "72748d8d6030aac034e5b74229898016f833b33a",
       "version": "1.0.18",