diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake
index 92d588b814..d6086334c4 100644
--- a/ports/libeventheader-decode/portfile.cmake
+++ b/ports/libeventheader-decode/portfile.cmake
@@ -4,19 +4,31 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "microsoft/LinuxTracepoints"
     REF "v${VERSION}"
-    SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067
+    SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
     HEAD_REF main)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools  BUILD_TOOLS
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DBUILD_SAMPLES=OFF
-        -DBUILD_TOOLS=OFF)
+)
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
+if (BUILD_TOOLS)
+    vcpkg_copy_tools(
+        TOOL_NAMES perf-decode
+        AUTO_CLEAN)
+endif()
+
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME eventheader-decode
     CONFIG_PATH lib/cmake/eventheader-decode)
diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json
index 2c8490d413..a65da1ee9b 100644
--- a/ports/libeventheader-decode/vcpkg.json
+++ b/ports/libeventheader-decode/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libeventheader-decode",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints",
   "homepage": "https://github.com/microsoft/LinuxTracepoints/",
   "license": "MIT",
@@ -8,11 +8,11 @@
   "dependencies": [
     {
       "name": "libeventheader-tracepoint",
-      "version>=": "1.3.3"
+      "version>=": "1.4.0"
     },
     {
       "name": "libtracepoint-decode",
-      "version>=": "1.3.3"
+      "version>=": "1.4.0"
     },
     {
       "name": "vcpkg-cmake",
@@ -22,5 +22,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build user tools: perf-decode"
+    }
+  }
 }
diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake
index 81e235ae41..1bac3b75a3 100644
--- a/ports/libeventheader-tracepoint/portfile.cmake
+++ b/ports/libeventheader-tracepoint/portfile.cmake
@@ -6,14 +6,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "microsoft/LinuxTracepoints"
     REF "v${VERSION}"
-    SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067
+    SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
     HEAD_REF main)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint"
     OPTIONS
         -DBUILD_SAMPLES=OFF
-        -DBUILD_TOOLS=OFF)
+)
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json
index 359b5f5e03..eaf8c7e017 100644
--- a/ports/libeventheader-tracepoint/vcpkg.json
+++ b/ports/libeventheader-tracepoint/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libeventheader-tracepoint",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints",
   "homepage": "https://github.com/microsoft/LinuxTracepoints/",
   "license": "MIT",
@@ -8,7 +8,7 @@
   "dependencies": [
     {
       "name": "libtracepoint",
-      "version>=": "1.3.3"
+      "version>=": "1.4.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/ports/libtracepoint-control/portfile.cmake b/ports/libtracepoint-control/portfile.cmake
index d2713407c2..3bf156d470 100644
--- a/ports/libtracepoint-control/portfile.cmake
+++ b/ports/libtracepoint-control/portfile.cmake
@@ -4,20 +4,30 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "microsoft/LinuxTracepoints"
     REF "v${VERSION}"
-    SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067
+    SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
     HEAD_REF main)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools  BUILD_TOOLS
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/libtracepoint-control-cpp"
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         -DBUILD_SAMPLES=OFF
-        -DBUILD_TESTS=OFF
-        -DBUILD_TOOLS=OFF)
+)
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
+if (BUILD_TOOLS)
+    vcpkg_copy_tools(
+        TOOL_NAMES perf-collect
+        AUTO_CLEAN)
+endif()
+
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME tracepoint-control
     CONFIG_PATH lib/cmake/tracepoint-control)
diff --git a/ports/libtracepoint-control/vcpkg.json b/ports/libtracepoint-control/vcpkg.json
index 05ab67345e..2b84b6711a 100644
--- a/ports/libtracepoint-control/vcpkg.json
+++ b/ports/libtracepoint-control/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libtracepoint-control",
-  "version": "1.3.3",
-  "port-version": 1,
+  "version": "1.4.0",
   "description": "C++ classes for collecting Linux Tracepoints",
   "homepage": "https://github.com/microsoft/LinuxTracepoints/",
   "license": "MIT",
@@ -9,7 +8,7 @@
   "dependencies": [
     {
       "name": "libtracepoint-decode",
-      "version>=": "1.3.3"
+      "version>=": "1.4.0"
     },
     {
       "name": "vcpkg-cmake",
@@ -19,5 +18,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build user tools: perf-collect",
+      "supports": "linux"
+    }
+  }
 }
diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake
index 510680b4d2..76a6ef819f 100644
--- a/ports/libtracepoint-decode/portfile.cmake
+++ b/ports/libtracepoint-decode/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "microsoft/LinuxTracepoints"
     REF "v${VERSION}"
-    SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067
+    SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
     HEAD_REF main)
 
 vcpkg_cmake_configure(
diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json
index e6b325fcdc..960ec77fff 100644
--- a/ports/libtracepoint-decode/vcpkg.json
+++ b/ports/libtracepoint-decode/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libtracepoint-decode",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "C++ classes for decoding Linux Tracepoints",
   "homepage": "https://github.com/microsoft/LinuxTracepoints/",
   "license": "MIT",
diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake
index faff2a3ecf..e905935ccf 100644
--- a/ports/libtracepoint/portfile.cmake
+++ b/ports/libtracepoint/portfile.cmake
@@ -6,20 +6,30 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "microsoft/LinuxTracepoints"
     REF "v${VERSION}"
-    SHA512 b296ad3ee102d45cd8bccb2e3ed478f3d7adff8b3650251926189fd6efbca38728db61208af1627c08c16641b349e31e9366c6bc1965795063f39a167181f067
+    SHA512 baf27c967b2fa1fb8e8684951fd8e12e40fe9c23f5052a2d77c63eceab6ddfc112537422b97c37cfb0e479361fa8aedea6d8d7edfae91810f1ed696060fcb822
     HEAD_REF main)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools  BUILD_TOOLS)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/libtracepoint"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DBUILD_SAMPLES=OFF
-        -DBUILD_TOOLS=OFF
         -DBUILD_TESTS=OFF)
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
+if (BUILD_TOOLS)
+    vcpkg_copy_tools(
+        TOOL_NAMES tracepoint-register
+        AUTO_CLEAN)
+endif()
+
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_cmake_config_fixup(
         PACKAGE_NAME tracepoint
diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json
index 6af5b48a47..3c6518f96d 100644
--- a/ports/libtracepoint/vcpkg.json
+++ b/ports/libtracepoint/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libtracepoint",
-  "version": "1.3.3",
-  "port-version": 1,
+  "version": "1.4.0",
   "description": "C/C++ interface for generating Linux Tracepoints",
   "homepage": "https://github.com/microsoft/LinuxTracepoints/",
   "license": "MIT",
@@ -15,5 +14,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build user tools: tracepoint-register",
+      "supports": "linux"
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index e6f34965b7..2bc89790e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4385,11 +4385,11 @@
       "port-version": 1
     },
     "libeventheader-decode": {
-      "baseline": "1.3.3",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "libeventheader-tracepoint": {
-      "baseline": "1.3.3",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "libevhtp": {
@@ -5093,15 +5093,15 @@
       "port-version": 0
     },
     "libtracepoint": {
-      "baseline": "1.3.3",
-      "port-version": 1
+      "baseline": "1.4.0",
+      "port-version": 0
     },
     "libtracepoint-control": {
-      "baseline": "1.3.3",
-      "port-version": 1
+      "baseline": "1.4.0",
+      "port-version": 0
     },
     "libtracepoint-decode": {
-      "baseline": "1.3.3",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "libu2f-server": {
diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json
index 8d208e7a01..d615d9beef 100644
--- a/versions/l-/libeventheader-decode.json
+++ b/versions/l-/libeventheader-decode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c09584c798815084e1889cb8d74627d4fc3d6e34",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "30514fb5dce7aa046e1b71f658cc3cc10a0366ec",
       "version": "1.3.3",
diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json
index 424bd4c0e8..b30d448b10 100644
--- a/versions/l-/libeventheader-tracepoint.json
+++ b/versions/l-/libeventheader-tracepoint.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "573c10d322f63b1eca14f7f176b1f129b0375d0c",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d6fd027094b3930216990f5572f1de34531d4b05",
       "version": "1.3.3",
diff --git a/versions/l-/libtracepoint-control.json b/versions/l-/libtracepoint-control.json
index afa46743dd..90b5d64e1a 100644
--- a/versions/l-/libtracepoint-control.json
+++ b/versions/l-/libtracepoint-control.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "77d1f20773ba8b6d4cb0bd56c508a11521bb6577",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b43d20ba774f4d86540350bd84f420e1bcaa386b",
       "version": "1.3.3",
diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json
index 17fabbd761..5ac15adddb 100644
--- a/versions/l-/libtracepoint-decode.json
+++ b/versions/l-/libtracepoint-decode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "27e3b141818c89cc05ff4d66ee23f0b945ef8e2f",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1e04ce7805f13762e06cd0bb01069e1b27f283f2",
       "version": "1.3.3",
diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json
index c4ff482b53..58080c3407 100644
--- a/versions/l-/libtracepoint.json
+++ b/versions/l-/libtracepoint.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "914ce95e52f114854f76063fda0789ba1590f897",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4f06adb290d6c05a65c1c62c8e37edc43f33eeac",
       "version": "1.3.3",