diff --git a/component/index.js b/component/index.js
index 5e37c8f..1d50772 100644
--- a/component/index.js
+++ b/component/index.js
@@ -3,12 +3,19 @@ var util = require('util');
 var ScriptBase = require('../script-base.js');
 
 var ComponentGenerator = module.exports = function ComponentGenerator(args, options, config) {
+
   ScriptBase.apply(this, arguments);
 };
 
 util.inherits(ComponentGenerator, ScriptBase);
 
 ComponentGenerator.prototype.createComponentFile = function createComponentFile() {
+    this.option('es6');
+
+
+  this.es6 = this.options.es6;
+    console.log('es6:', this.es6)
+
   this.generateSourceAndTest(
     'Component',
     'spec/Component',
diff --git a/templates/javascript/Component.jsx b/templates/javascript/Component.jsx
index ae0869a..fe84508 100644
--- a/templates/javascript/Component.jsx
+++ b/templates/javascript/Component.jsx
@@ -19,5 +19,9 @@ var <%= classedName %> = React.createClass({
       );
   }
 });
-
+<% if (es6) { %>
+export default <%= classedName %>;
+<% } else { %>
 module.exports = <%= classedName %>;
+<% } %>
+