diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 8906bde9525..dabd00c3432 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2186,7 +2186,9 @@ module ts {
 
             if (!scanner.hasPrecedingLineBreak() &&
                 (token === SyntaxKind.AsteriskToken || isStartOfExpression())) {
-                parseOptional(SyntaxKind.AsteriskToken);
+                if (parseOptional(SyntaxKind.AsteriskToken)) {
+                    node.flags = NodeFlags.YieldStar;
+                }
 
                 node.expression = parseAssignmentExpression();
                 return finishNode(node);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 0003317a9ce..a2fc1f144fe 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -272,6 +272,7 @@ module ts {
         Const               = 0x00001000,  // Variable declaration
         OctalLiteral        = 0x00002000,
         Generator           = 0x00004000,
+        YieldStar           = 0x00008000,
 
         Modifier = Export | Ambient | Public | Private | Protected | Static,
         AccessibilityModifier = Public | Private | Protected,