diff --git a/src/Lean/Elab/Binders.lean b/src/Lean/Elab/Binders.lean
index 6397b22658..8bd8d585e0 100644
--- a/src/Lean/Elab/Binders.lean
+++ b/src/Lean/Elab/Binders.lean
@@ -434,6 +434,13 @@ private def expandLetEqnsDeclVal (ref : Syntax) (alts : Syntax) : Nat → Array
   body ← expandLetEqnsDeclVal n discrs;
   `(fun $x => $body)
 
+def expandLetEqnsDecl (letDecl : Syntax) : MacroM Syntax := do
+let ref     := letDecl;
+let alts    := letDecl.getArg 4;
+let numPats := getMatchAltNumPatterns alts;
+val ← expandLetEqnsDeclVal ref alts numPats #[];
+pure $ Syntax.node `Lean.Parser.Term.letIdDecl #[letDecl.getArg 0, letDecl.getArg 1, letDecl.getArg 2, mkAtomFrom ref " := ", val]
+
 def elabLetDeclCore (stx : Syntax) (expectedType? : Option Expr) (useLetExpr : Bool) : TermElabM Expr := do
 let ref     := stx;
 let letDecl := (stx.getArg 1).getArg 0;
@@ -452,12 +459,7 @@ else if letDecl.getKind == `Lean.Parser.Term.letPatDecl then do
   let stxNew  := if useLetExpr then stxNew else stxNew.updateKind `Lean.Parser.Term.«let!»;
   withMacroExpansion stx stxNew $ elabTerm stxNew expectedType?
 else if letDecl.getKind == `Lean.Parser.Term.letEqnsDecl then do
-  let alts    := letDecl.getArg 4;
-  let numPats := getMatchAltNumPatterns alts;
-  val ← liftMacroM $ expandLetEqnsDeclVal ref alts numPats #[];
-  let newDecl := Syntax.node `Lean.Parser.Term.letIdDecl
-    #[letDecl.getArg 0, letDecl.getArg 1, letDecl.getArg 2, mkAtomFrom ref " := ", val];
-  let declNew := (stx.getArg 1).setArg 0 newDecl;
+  declNew ← liftMacroM $ expandLetEqnsDecl letDecl;
   let stxNew  := stx.setArg 1 declNew;
   withMacroExpansion stx stxNew $ elabTerm stxNew expectedType?
 else
diff --git a/src/Lean/Elab/LetRec.lean b/src/Lean/Elab/LetRec.lean
index e3cd298f22..02af27d697 100644
--- a/src/Lean/Elab/LetRec.lean
+++ b/src/Lean/Elab/LetRec.lean
@@ -10,9 +10,63 @@ namespace Lean
 namespace Elab
 namespace Term
 
+structure LetRecDecl :=
+(attrs : Syntax)
+(decl  : Syntax)
+
+structure LetRecView :=
+(ref       : Syntax)
+(isPartial : Bool)
+(decls     : Array LetRecDecl)
+(body      : Syntax)
+
+private def mkLetRecView (letRec : Syntax) : LetRecView :=
+let decls     := (letRec.getArg 2).getArgs.getSepElems.map fun attrDeclSyntax =>
+  { attrs := attrDeclSyntax.getArg 0, decl := (attrDeclSyntax.getArg 1).getArg 0 : LetRecDecl };
+{ decls     := decls,
+  ref       := letRec,
+  isPartial := !(letRec.getArg 1).isNone,
+  body      := letRec.getArg 4 }
+
+def LetRecView.review (view : LetRecView) : Syntax :=
+let result := view.ref;
+let result := result.setArg 4 view.body;
+let result :=
+  if view.isPartial then
+    if (result.getArg 1).isNone then
+      result.setArg 1 (mkNullNode #[mkAtomFrom result "partial "])
+    else
+      result
+  else
+    result.setArg 1 mkNullNode;
+let result := result.setArg 2 $ mkSepStx
+    (view.decls.map fun decl => mkNullNode #[decl.attrs, mkNode `Lean.Parser.Term.letDecl #[decl.decl]])
+    (mkAtomFrom result ", ");
+result
+
+private def isLetEqnsDecl (d : LetRecDecl) : Bool :=
+d.decl.isOfKind `Lean.Parser.Term.letEqnsDecl
+
+private def elabLetRecView (view : LetRecView) (expectedType? : Option Expr) : TermElabM Expr :=
+throwError ("WIP " ++ mkNullNode (view.decls.map fun (d : LetRecDecl) => d.decl))
+
 @[builtinTermElab «letrec»] def elabLetRec : TermElab :=
-fun stx expectedType? =>
-  throwError ("WIP " ++ stx)
+fun stx expectedType? => do
+  let view := mkLetRecView stx;
+  view.decls.forM fun (d : LetRecDecl) =>
+    when ((d.decl.getArg 0).isOfKind `Lean.Parser.Term.letPatDecl) $
+      throwErrorAt d.decl "patterns are not allowed in letrec expressions";
+  if view.decls.any isLetEqnsDecl then do
+    newDecls ← view.decls.mapM fun d =>
+      if isLetEqnsDecl d then do
+        newDecl ← liftMacroM $ expandLetEqnsDecl d.decl;
+        pure { d with decl := newDecl }
+      else
+        pure d;
+    let stxNew := { view with decls := newDecls }.review;
+    withMacroExpansion stx stxNew $ elabTerm stxNew expectedType?
+  else
+    elabLetRecView view expectedType?
 
 end Term
 end Elab