diff --git a/src/Lean/Elab/Match.lean b/src/Lean/Elab/Match.lean
index a67512c3bd..1803cbfe5b 100644
--- a/src/Lean/Elab/Match.lean
+++ b/src/Lean/Elab/Match.lean
@@ -709,12 +709,16 @@ builtin_initialize
 def ignoreUnusedAlts (opts : Options) : Bool :=
   opts.get `match.ignoreUnusedAlts false
 
-def reportMatcherResultErrors (result : MatcherResult) : TermElabM Unit := do
-  -- TODO: improve error messages
+def reportMatcherResultErrors (altLHSS : List AltLHS) (result : MatcherResult) : TermElabM Unit := do
   unless result.counterExamples.isEmpty do
     throwError! "missing cases:\n{Meta.Match.counterExamplesToMessageData result.counterExamples}"
   unless ignoreUnusedAlts (← getOptions) || result.unusedAltIdxs.isEmpty do
-    throwError! "unused alternatives: {result.unusedAltIdxs.map fun idx => s!"#{idx+1}"}"
+    let mut i := 0
+    for alt in altLHSS do
+      if result.unusedAltIdxs.contains i then
+        withRef alt.ref do
+          logError "redundant alternative"
+      i := i + 1
 
 private def elabMatchAux (discrStxs : Array Syntax) (altViews : Array MatchAltView) (matchOptType : Syntax) (expectedType : Expr)
     : TermElabM Expr := do
@@ -760,7 +764,7 @@ private def elabMatchAux (discrStxs : Array Syntax) (altViews : Array MatchAltVi
   let matcherName ← mkAuxName `match
   let matcherResult ← mkMatcher matcherName matchType numDiscrs altLHSS
   let motive ← forallBoundedTelescope matchType numDiscrs fun xs matchType => mkLambdaFVars xs matchType
-  reportMatcherResultErrors matcherResult
+  reportMatcherResultErrors altLHSS matcherResult
   let r := mkApp matcherResult.matcher motive
   let r := mkAppN r discrs
   let r := mkAppN r rhss
diff --git a/tests/lean/redundantAlt.lean b/tests/lean/redundantAlt.lean
new file mode 100644
index 0000000000..fa1eb81dcd
--- /dev/null
+++ b/tests/lean/redundantAlt.lean
@@ -0,0 +1,7 @@
+def f (x : Nat) : Nat :=
+ match x with
+ | 0 => 1
+ | Nat.succ (Nat.succ x) => 3
+ | 2 => 4
+ | Nat.succ x => 5
+ | 3 => 6
diff --git a/tests/lean/redundantAlt.lean.expected.out b/tests/lean/redundantAlt.lean.expected.out
new file mode 100644
index 0000000000..773496d783
--- /dev/null
+++ b/tests/lean/redundantAlt.lean.expected.out
@@ -0,0 +1,2 @@
+redundantAlt.lean:5:1: error: redundant alternative
+redundantAlt.lean:7:1: error: redundant alternative