diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake
index 90615e522c..428b9fa874 100644
--- a/ports/argtable3/portfile.cmake
+++ b/ports/argtable3/portfile.cmake
@@ -1,12 +1,9 @@
-vcpkg_download_distfile(ARCHIVE
-   URLS "https://github.com/argtable/argtable3/releases/download/v3.2.1.52f24e5/argtable-v3.2.1.52f24e5.tar.gz"
-   FILENAME "argtable-v3.2.1.52f24e5.tar.gz"
-   SHA512 cec77d56048b38bb7af8553cb660e745972bbd90378eeea4e928579af78190c8a41fdb29c972263e18955e3a497e09c42f705f7c4d548c3c523c5cb104c97a10
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    REPO argtable/argtable3
+    REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support
+    SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc
+    HEAD_REF master
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json
index 29d863dee2..527cc3bdf6 100644
--- a/ports/argtable3/vcpkg.json
+++ b/ports/argtable3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "argtable3",
   "version": "3.2.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options",
   "homepage": "https://www.argtable.org/",
   "license": "BSD-2-Clause-FreeBSD",
diff --git a/versions/a-/argtable3.json b/versions/a-/argtable3.json
index 73a0032169..a859cfbabe 100644
--- a/versions/a-/argtable3.json
+++ b/versions/a-/argtable3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fe3b1c9a876237412e7ba925a3b41f62e7fc1d99",
+      "version": "3.2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "acbbb26e54e658b8af673a112fb338274275ad6b",
       "version": "3.2.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4ad7e21acc..b938f79f37 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -150,7 +150,7 @@
     },
     "argtable3": {
       "baseline": "3.2.1",
-      "port-version": 1
+      "port-version": 2
     },
     "argumentum": {
       "baseline": "0.3.1",