diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 721033d4e238f4..9ff3ab675615d7 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -78,6 +78,7 @@
 import net.starlark.java.eval.Starlark;
 import net.starlark.java.eval.StarlarkCallable;
 import net.starlark.java.eval.StarlarkThread;
+import net.starlark.java.spelling.SpellChecker;
 import net.starlark.java.syntax.Location;
 
 /**
@@ -2080,7 +2081,16 @@ private <T> BitSet populateDefinedRuleAttributeValues(
       if (attrIndex == null) {
         rule.reportError(
             String.format(
-                "%s: no such attribute '%s' in '%s' rule", rule.getLabel(), attributeName, name),
+                "%s: no such attribute '%s' in '%s' rule%s",
+                rule.getLabel(),
+                attributeName,
+                name,
+                SpellChecker.didYouMean(
+                    attributeName,
+                    rule.getAttributes().stream()
+                        .filter(Attribute::isDocumented)
+                        .map(Attribute::getName)
+                        .collect(ImmutableList.toImmutableList()))),
             eventHandler);
         continue;
       }