diff --git a/doc/langref.html.in b/doc/langref.html.in
index 601b53463f83283a76bd7b778f702be79d4f1662..de029fd236d33969897b9b0a8bf7ab7f0bec70d4 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -385,7 +385,7 @@ pub fn main() -> %void {
         <tr>
           <td><code>noreturn</code></td>
           <td>(none)</td>
-          <td>the type of <code>break</code>, <code>continue</code>, <code>goto</code>, <code>return</code>, <code>unreachable</code>, and <code>while (true) {}</code></td>
+          <td>the type of <code>break</code>, <code>continue</code>, <code>return</code>, <code>unreachable</code>, and <code>while (true) {}</code></td>
         </tr>
         <tr>
           <td><code>type</code></td>
@@ -2622,7 +2622,6 @@ test "type of unreachable" {
       <ul>
         <li><code>break</code></li>
         <li><code>continue</code></li>
-        <li><code>goto</code></li>
         <li><code>return</code></li>
         <li><code>unreachable</code></li>
         <li><code>while (true) {}</code></li>
@@ -3321,7 +3320,7 @@ test "foo" {
       </p>
       <ul>
         <li>All variables are <code>comptime</code> variables.</li>
-        <li>All <code>if</code>, <code>while</code>, <code>for</code>, <code>switch</code>, and <code>goto</code>
+        <li>All <code>if</code>, <code>while</code>, <code>for</code>, and <code>switch</code>
           expressions are evaluated at compile-time, or emit a compile error if this is not possible.</li>
         <li>All function calls cause the compiler to interpret the function at compile-time, emitting a
           compile error if the function tries to do something that has global run-time side effects.</li>
@@ -5765,7 +5764,7 @@ hljs.registerLanguage("zig", function(t) {
         },
         a = t.IR + "\\s*\\(",
         c = {
-            keyword: "const align var extern stdcallcc nakedcc volatile export pub noalias inline struct packed enum union goto break return try catch test continue unreachable comptime and or asm defer if else switch while for fn use bool f32 f64 void type noreturn error i8 u8 i16 u16 i32 u32 i64 u64 isize usize i8w u8w i16w i32w u32w i64w u64w isizew usizew c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong",
+            keyword: "const align var extern stdcallcc nakedcc volatile export pub noalias inline struct packed enum union break return try catch test continue unreachable comptime and or asm defer errdefer if else switch while for fn use bool f32 f64 void type noreturn error i8 u8 i16 u16 i32 u32 i64 u64 isize usize i8w u8w i16w i32w u32w i64w u64w isizew usizew c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong",
             built_in: "breakpoint returnAddress frameAddress fieldParentPtr setFloatMode IntType OpaqueType compileError compileLog setCold setDebugSafety setEvalBranchQuota offsetOf memcpy inlineCall setGlobalLinkage setGlobalSection divTrunc divFloor enumTagName intToPtr ptrToInt panic canImplicitCast ptrCast bitCast rem mod memset sizeOf alignOf alignCast maxValue minValue memberCount typeOf addWithOverflow subWithOverflow mulWithOverflow shlWithOverflow shlExact shrExact cInclude cDefine cUndef ctz clz import cImport errorName embedFile cmpxchg fence divExact truncate",
             literal: "true false null undefined"
         },
diff --git a/src/ast_render.cpp b/src/ast_render.cpp
index abe880941cb3cb07e2f3b40a7acd22d359a526e8..9910b17f0d672061600e2def8f7cb563c051f805 100644
--- a/src/ast_render.cpp
+++ b/src/ast_render.cpp
@@ -92,7 +92,7 @@ static const char *return_string(ReturnKind kind) {
 static const char *defer_string(ReturnKind kind) {
     switch (kind) {
         case ReturnKindUnconditional: return "defer";
-        case ReturnKindError: return "%defer";
+        case ReturnKindError: return "errdefer";
     }
     zig_unreachable();
 }