diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index fef2d3e1c8dabf..129a1de287cc6b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -214,3 +214,8 @@ jobs:
               if: always()
               run: |
                   git grep -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
+
+            - name: Check that our hardcoded SHA for clang-format on ARM mac matches the pigweed SHA.
+              if: always()
+              run: |
+                  ./scripts/lints/clang-format-version-matches.py
diff --git a/scripts/lints/clang-format-version-matches.py b/scripts/lints/clang-format-version-matches.py
new file mode 100755
index 00000000000000..09bf7eda7d8e15
--- /dev/null
+++ b/scripts/lints/clang-format-version-matches.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+#
+#    Copyright (c) 2021 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+import json
+import os
+
+CHIP_ROOT_DIR = os.path.realpath(
+    os.path.join(os.path.dirname(__file__), '../..'))
+
+
+def readClangRevision(jsonFileName):
+    with open(os.path.join(CHIP_ROOT_DIR, jsonFileName)) as file:
+        data = json.load(file)
+
+    packages = data['packages']
+    for package in packages:
+        if package['path'].startswith('fuchsia/third_party/clang/'):
+            return package['tags']
+
+    raise Exception('Could not find clang package in %s' % jsonFileName)
+
+
+pigweed_revision = readClangRevision('third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json')
+
+our_file = 'scripts/setup/clang.json'
+our_revision = readClangRevision(our_file)
+
+if our_revision != pigweed_revision:
+    raise Exception('In %s, "%s" should be changed to "%s"' % (our_file, our_revision, pigweed_revision))
diff --git a/scripts/setup/clang.json b/scripts/setup/clang.json
new file mode 100644
index 00000000000000..a1f1e6d449e5b6
--- /dev/null
+++ b/scripts/setup/clang.json
@@ -0,0 +1,9 @@
+{
+    "packages": [
+        {
+            "path": "fuchsia/third_party/clang/mac-arm64",
+            "platforms": ["mac-arm64"],
+            "tags": ["git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855"]
+        }
+    ]
+}
diff --git a/scripts/setup/environment.json b/scripts/setup/environment.json
index ebe77d9db6dbc8..6c32bb62ebe8e4 100644
--- a/scripts/setup/environment.json
+++ b/scripts/setup/environment.json
@@ -2,6 +2,7 @@
     "cipd_package_files": [
         "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json",
         "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+        "scripts/setup/clang.json",
         "scripts/setup/python.json",
         "scripts/setup/zap.json"
     ],