diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index 10a907a9cf..c89c4481da 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oneapi-src/oneTBB
     REF "v${VERSION}"
-    SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
+    SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
     HEAD_REF onetbb_2021
 )
 
@@ -22,6 +22,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB")
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+set(arch_suffix "")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+  set(arch_suffix "32")
+endif()
+
+
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share/doc"
     "${CURRENT_PACKAGES_DIR}/debug/include"
diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json
index 83bd4f4261..4a591ba63a 100644
--- a/ports/tbb/vcpkg.json
+++ b/ports/tbb/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tbb",
-  "version": "2021.7.0",
+  "version": "2021.8.0",
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 03f869b08f..1c3e7a74d1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7485,7 +7485,7 @@
       "port-version": 0
     },
     "tbb": {
-      "baseline": "2021.7.0",
+      "baseline": "2021.8.0",
       "port-version": 0
     },
     "tcb-span": {
diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json
index e4681c598d..23d443e1b7 100644
--- a/versions/t-/tbb.json
+++ b/versions/t-/tbb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d08a7732c5a162a88ac98871ebf98869d5490a97",
+      "version": "2021.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9bf00b5406242c641f8408179ed84be389fc5f69",
       "version": "2021.7.0",