diff --git a/src/generators/flexbox.js b/src/generators/flexbox.js
index 233208557..30827dc7e 100644
--- a/src/generators/flexbox.js
+++ b/src/generators/flexbox.js
@@ -93,10 +93,10 @@ export default function() {
       flex: '1 1 0%',
     },
     'flex-auto': {
-      flex: 'auto',
+      flex: '1 1 auto',
     },
     'flex-initial': {
-      flex: 'initial',
+      flex: '0 1 auto',
     },
     'flex-none': {
       flex: 'none',