diff --git a/ports/civetweb/fix-fseeko.patch b/ports/civetweb/fix-fseeko.patch
new file mode 100644
index 0000000000..3e2f58500b
--- /dev/null
+++ b/ports/civetweb/fix-fseeko.patch
@@ -0,0 +1,17 @@
+diff --git a/src/civetweb.c b/src/civetweb.c
+index 9e321ed..0f11407 100644
+--- a/src/civetweb.c
++++ b/src/civetweb.c
+@@ -892,6 +892,12 @@ typedef unsigned short int in_port_t;
+ #if defined(USE_X_DOM_SOCKET)
+ #include <sys/un.h>
+ #endif
++
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
++    // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and
++    #define fseeko fseek
++#endif
++
+ #endif
+ 
+ #define vsnprintf_impl vsnprintf
diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
index 35ba8153fa..8387cac907 100644
--- a/ports/civetweb/portfile.cmake
+++ b/ports/civetweb/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO civetweb/civetweb
-    REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15
-    SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d
+    REF "v${VERSION}"
+    SHA512 a0b943dfc76d7fd47f5a7d2c834fd38ddd4cf01a11730cf2f7cfaf32fea9698f59672f3a0f86ac80e0abc315d94d2367a500d37013f305c87d45e84cf39ca816
     HEAD_REF master
     PATCHES
         disable_warnings.patch # cl will simply ignore the other invalid options. 
+        fix-fseeko.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -39,6 +40,11 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb.pc")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb-cpp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb-cpp.pc")
+vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json
index 64394576ec..ab5c083e91 100644
--- a/ports/civetweb/vcpkg.json
+++ b/ports/civetweb/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "civetweb",
-  "version": "1.15",
-  "port-version": 4,
+  "version": "1.16",
   "description": "Easy to use, powerful, C/C++ embeddable web server.",
   "homepage": "https://github.com/civetweb/civetweb",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7f7ef63cdd..8311d42eee 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1557,8 +1557,8 @@
       "port-version": 3
     },
     "civetweb": {
-      "baseline": "1.15",
-      "port-version": 4
+      "baseline": "1.16",
+      "port-version": 0
     },
     "cjson": {
       "baseline": "1.7.16",
diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json
index 76a128393b..323c526f17 100644
--- a/versions/c-/civetweb.json
+++ b/versions/c-/civetweb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "46ba5309a5759827c0d729344e8f17cc5f3132b9",
+      "version": "1.16",
+      "port-version": 0
+    },
     {
       "git-tree": "10dad0fc40c4cb9fe210cabab019806d2b32230d",
       "version": "1.15",