diff --git a/tools/distrib/buildifier_format_code.sh b/tools/distrib/buildifier_format_code.sh
new file mode 100755
index 00000000000..818b6dc31b4
--- /dev/null
+++ b/tools/distrib/buildifier_format_code.sh
@@ -0,0 +1,68 @@
+#! /bin/bash -ex
+# Copyright 2019 The gRPC 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.
+
+BUILDIFIER_VERSION="0.29.0"
+TEMP_BUILDIFIER_PATH="/tmp/buildifier"
+EXTRA_BUILDIFIER_FLAGS=$*
+
+function error_handling() {
+    error=$1
+    if [[ -x "$error" ]]; then
+        echo "${error}"
+        exit 1
+    fi
+}
+
+function download_buildifier() {
+    platform="$(uname -s)"
+    case "${platform}" in
+        Linux*)     download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDIFIER_VERSION}/buildifier";;
+        Darwin*)    download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDIFIER_VERSION}/buildifier.mac";;
+        *)          error_handling "Unsupported platform: ${platform}";;
+    esac
+
+    if [ -x "$(command -v curl)" ]; then
+        curl -L -o ${TEMP_BUILDIFIER_PATH} ${download_link}
+    elif [ -x "$(command -v wget)" ]; then
+        wget -O ${TEMP_BUILDIFIER_PATH} ${download_link}
+    else
+        error_handling "Download failed: curl and wget not available"
+    fi
+
+    chmod +x ${TEMP_BUILDIFIER_PATH}
+}
+
+
+# Get the correct versino of buildifier
+if [ -x "$(command -v buildifier)" ]; then
+    existing_buildifier_version="$(buildifier -version 2>&1 | head -n1 | cut -d" " -f3)"
+    if [[ "${existing_buildifier_version}" != "${BUILDIFIER_VERSION}" ]]; then
+        download_buildifier
+        buildifier_bin="${TEMP_BUILDIFIER_PATH}"
+    else
+        buildifier_bin="buildifier"
+    fi
+else
+    download_buildifier
+    buildifier_bin="${TEMP_BUILDIFIER_PATH}"
+fi
+
+# cd to repo root
+dir=$(dirname "${0}")
+cd "${dir}/../.."
+
+bazel_files=$(find . \( -iname 'BUILD' -o -iname '*.bzl' -o -iname '*.bazel' -o -iname 'WORKSPACE' \) -type f -not -path "./third_party/*")
+# shellcheck disable=SC2086,SC2068
+${buildifier_bin} ${EXTRA_BUILDIFIER_FLAGS[@]} -v ${bazel_files}
diff --git a/tools/distrib/buildifier_format_code_strict.sh b/tools/distrib/buildifier_format_code_strict.sh
new file mode 100755
index 00000000000..e8a984184c2
--- /dev/null
+++ b/tools/distrib/buildifier_format_code_strict.sh
@@ -0,0 +1,20 @@
+#! /bin/bash -ex
+# Copyright 2019 The gRPC 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.
+
+
+dir=$(dirname "${0}")
+buildifier_format_script="${dir}/buildifier_format_code.sh"
+
+${buildifier_format_script} -lint warn