diff --git a/ports/duckdb/portfile.cmake b/ports/duckdb/portfile.cmake
index 15f26fa066f23e..cd8c032f70529d 100644
--- a/ports/duckdb/portfile.cmake
+++ b/ports/duckdb/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_from_github(
         REPO duckdb/duckdb
         REF v${VERSION}
         SHA512 7e2ec4f6d6be6d500b148bd845cc51fe8985190eed8ab6f6fe79012c216cad5592ab3329e2df6b091abcc6ea8937d66f47272baead798c7d711e5d73aa9ffaa7
-        HEAD_REF master
+        HEAD_REF main
     PATCHES
         bigobj.patch
         unvendor_icu_and_find_dependency.patch # https://github.com/duckdb/duckdb/pull/16176 + https://github.com/duckdb/duckdb/pull/16197
         httpfs.patch
+        t-external-icu.patch # from https://github.com/duckdb/duckdb/pull/16676
         )
 
 # Remove vendored dependencies which are not properly namespaced
diff --git a/ports/duckdb/t-external-icu.patch b/ports/duckdb/t-external-icu.patch
new file mode 100644
index 00000000000000..bf0bfa6c051346
--- /dev/null
+++ b/ports/duckdb/t-external-icu.patch
@@ -0,0 +1,35 @@
+diff --git a/DuckDBConfig.cmake.in b/DuckDBConfig.cmake.in
+index 2e5270e..7c5ce31 100644
+--- a/DuckDBConfig.cmake.in
++++ b/DuckDBConfig.cmake.in
+@@ -7,7 +7,7 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+ if(NOT @WITH_INTERNAL_ICU@)
+-    find_dependency(ICU COMPONENTS i18n uc)
++    find_dependency(ICU COMPONENTS i18n uc data)
+ endif()
+ 
+ # Compute paths
+diff --git a/extension/icu/CMakeLists.txt b/extension/icu/CMakeLists.txt
+index b5585e4..e3ae9cf 100644
+--- a/extension/icu/CMakeLists.txt
++++ b/extension/icu/CMakeLists.txt
+@@ -30,12 +30,15 @@ set(ICU_EXTENSION_FILES
+ build_static_extension(icu ${ICU_EXTENSION_FILES})
+ link_threads(icu_extension)
+ if(NOT WITH_INTERNAL_ICU)
+-    find_package(ICU COMPONENTS i18n uc REQUIRED)
+-    target_link_libraries(icu_extension ICU::i18n ICU::uc)
++    find_package(ICU COMPONENTS i18n uc data REQUIRED)
++    target_link_libraries(icu_extension ICU::i18n ICU::uc ICU::data)
+ endif()
+ disable_target_warnings(icu_extension)
+ set(PARAMETERS "-no-warnings")
+ build_loadable_extension(icu ${PARAMETERS} ${ICU_EXTENSION_FILES})
++if(NOT WITH_INTERNAL_ICU)
++  target_link_libraries(icu_loadable_extension ICU::i18n ICU::uc ICU::data)
++endif()
+ install(
+   TARGETS icu_extension
+   EXPORT "${DUCKDB_EXPORT_SET}"
diff --git a/ports/duckdb/vcpkg.json b/ports/duckdb/vcpkg.json
index 651b03b1ac2555..bfa0fbaaadf66c 100644
--- a/ports/duckdb/vcpkg.json
+++ b/ports/duckdb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "duckdb",
   "version": "1.2.1",
+  "port-version": 1,
   "description": "High-performance in-process analytical database system",
   "homepage": "https://duckdb.org",
   "license": "MIT",
diff --git a/scripts/test_ports/vcpkg-ci-duckdb/portfile.cmake b/scripts/test_ports/vcpkg-ci-duckdb/portfile.cmake
new file mode 100644
index 00000000000000..065116c276adcf
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-duckdb/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/test_ports/vcpkg-ci-duckdb/vcpkg.json b/scripts/test_ports/vcpkg-ci-duckdb/vcpkg.json
new file mode 100644
index 00000000000000..15263611eb4129
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-duckdb/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "vcpkg-ci-duckdb",
+  "version": "0.0.1",
+  "description": "Test the icu feature",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "duckdb",
+      "features": [
+        "icu"
+      ]
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index da7262cccf30b3..7ce45d508bbc12 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2434,7 +2434,7 @@
     },
     "duckdb": {
       "baseline": "1.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "duckx": {
       "baseline": "1.2.2",
diff --git a/versions/d-/duckdb.json b/versions/d-/duckdb.json
index b1ad1487fc1397..7c32ed4883b62d 100644
--- a/versions/d-/duckdb.json
+++ b/versions/d-/duckdb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "95e99c85866fb18cb5494092ea09a224200e7a9e",
+      "version": "1.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "213b32d9a3a2f7ef1676b475d18efa7d20879888",
       "version": "1.2.1",