diff --git a/ports/modp-base64/CMakeLists.txt b/ports/modp-base64/CMakeLists.txt
index 5a2dffe245..ddc02e3ba5 100644
--- a/ports/modp-base64/CMakeLists.txt
+++ b/ports/modp-base64/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 project(libmodpbase64 C)
 
 if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+  add_compile_options(/wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 configure_file(config.h.cmake config.h @ONLY)
@@ -20,7 +20,11 @@ install(
 
 if(NOT DISABLE_INSTALL_HEADERS)
   install(
-    FILES ${SOURCE_PATH}/src/modp_b64.h
+    FILES
+      "${SOURCE_PATH}/src/extern_c_begin.h"
+      "${SOURCE_PATH}/src/extern_c_end.h"
+      "${SOURCE_PATH}/src/modp_b64.h"
+      "${SOURCE_PATH}/src/modp_stdint.h"
     DESTINATION include
   )
 endif()
diff --git a/ports/modp-base64/portfile.cmake b/ports/modp-base64/portfile.cmake
index 2508b54fd4..ffa84b9c45 100644
--- a/ports/modp-base64/portfile.cmake
+++ b/ports/modp-base64/portfile.cmake
@@ -6,14 +6,13 @@ vcpkg_from_github(
   HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-  PREFER_NINJA
+vcpkg_cmake_configure(
+  SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}"
   OPTIONS -DSOURCE_PATH=${SOURCE_PATH}
   OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/modp-base64/vcpkg.json b/ports/modp-base64/vcpkg.json
index 2f222a982d..db22422194 100644
--- a/ports/modp-base64/vcpkg.json
+++ b/ports/modp-base64/vcpkg.json
@@ -1,6 +1,14 @@
 {
   "name": "modp-base64",
-  "version-string": "2020-09-26",
-  "port-version": 1,
-  "description": "High performance base64 encoder/decoder"
+  "version-date": "2020-09-26",
+  "port-version": 2,
+  "description": "High performance base64 encoder/decoder",
+  "homepage": "https://github.com/client9/stringencoders",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 54ec9875e3..742101208b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5026,7 +5026,7 @@
     },
     "modp-base64": {
       "baseline": "2020-09-26",
-      "port-version": 1
+      "port-version": 2
     },
     "mongo-c-driver": {
       "baseline": "1.22.2",
diff --git a/versions/m-/modp-base64.json b/versions/m-/modp-base64.json
index 0ec134f016..c88a7f0c06 100644
--- a/versions/m-/modp-base64.json
+++ b/versions/m-/modp-base64.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85f2a557b0fdca31efb6e9e6c769309d583ea2a3",
+      "version-date": "2020-09-26",
+      "port-version": 2
+    },
     {
       "git-tree": "8e39629dc5108d0e7dac7c91bea6e7fbdeaeee14",
       "version-string": "2020-09-26",