diff --git a/README.md b/README.md
index bf84dfb2..d7e08d44 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@ codechecker_test(
 Then invoke bazel:
 
 ```bash
-bazel test ://your_codechecker_rule_name
+bazel test //:your_codechecker_rule_name
 # Or, as a part of the rest of the testsuite
 bazel test ...
 ```
@@ -468,7 +468,7 @@ load(
 
 register_default_codechecker_tools()
 register_toolchains(
-    "//src:codechecker_local_toolchain",
+    "@rules_codechecker//src:codechecker_local_toolchain",
 )
 ```
 
@@ -481,9 +481,17 @@ First, you will have to create or obtain labels for codechecker, clang and clang
 
 You may create such a label like this:
 ```python
-filegroup(
+genrule(
     name = "clang",
-    srcs = ["/usr/bin/clang"],
+    outs = ["clang_wrapper.sh"],
+    cmd_bash = """
+cat > "$@" <<'EOF'
+#!/usr/bin/env bash
+exec /usr/bin/clang "$$@"
+EOF
+chmod +x "$@"
+""",
+    executable = True,
     visibility = ["//visibility:public"],
 )
 ```