diff --git a/packages/babel-types/src/definitions/jsx.js b/packages/babel-types/src/definitions/jsx.js
index 719e9d1698..8f2acabac0 100644
--- a/packages/babel-types/src/definitions/jsx.js
+++ b/packages/babel-types/src/definitions/jsx.js
@@ -11,8 +11,21 @@ define("JSXClosingElement", {
 });
 
 define("JSXElement", {
-  aliases: ["JSX", "Immutable", "Expression"]
+  builder: ["openingElement", "closingElement", "children", "selfClosing"],
   visitor: ["openingElement", "children", "closingElement"],
+  aliases: ["JSX", "Immutable", "Expression"],
+  fields: {
+    openingElement: {
+      validate: assertNodeType("JSXOpeningElement")
+    },
+    closingElement: {
+      optional: true,
+      validate: assertNodeType("JSXClosingElement")
+    },
+    children: {
+      // todo
+    }
+  }
 });
 
 define("JSXEmptyExpression", {