diff --git a/lib/6to5/generation/generators/expressions.js b/lib/6to5/generation/generators/expressions.js
index 52bd5af8b7..1b07d2dd67 100644
--- a/lib/6to5/generation/generators/expressions.js
+++ b/lib/6to5/generation/generators/expressions.js
@@ -64,15 +64,20 @@ exports.CallExpression = function (node, print) {
   this.push(")");
 };
 
-exports.YieldExpression = function (node, print) {
-  this.push("yield");
-  if (node.delegate) this.push("*");
-  if (node.argument) {
-    this.space();
-    print(node.argument);
-  }
+var buildYieldAwait = function (keyword) {
+  return function (node, print) {
+    this.push(keyword);
+    if (node.delegate) this.push("*");
+    if (node.argument) {
+      this.space();
+      print(node.argument);
+    }
+  };
 };
 
+exports.YieldExpression = buildYieldAwait("yield");
+exports.AwaitExpression = buildYieldAwait("await");
+
 exports.EmptyStatement = function () {
   this.semicolon();
 };