diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 654b476d8..bee52b31b 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -20,6 +20,7 @@ module.exports = {
     cursor: ['responsive'],
     display: ['responsive'],
     flexDirection: ['responsive'],
+    flexWrap: ['responsive'],
     flexbox: ['responsive'],
     float: ['responsive'],
     fontFamily: ['responsive'],
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 435071974..98455be07 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -14,6 +14,7 @@ import borderWidth from './plugins/borderWidth'
 import cursor from './plugins/cursor'
 import display from './plugins/display'
 import flexDirection from './plugins/flexDirection'
+import flexWrap from './plugins/flexWrap'
 import flexbox from './plugins/flexbox'
 import float from './plugins/float'
 import fontFamily from './plugins/fontFamily'
@@ -89,6 +90,7 @@ export default function(config) {
     cursor,
     display,
     flexDirection,
+    flexWrap,
     flexbox,
     float,
     fontFamily,
diff --git a/src/plugins/flexWrap.js b/src/plugins/flexWrap.js
new file mode 100644
index 000000000..369d1bb35
--- /dev/null
+++ b/src/plugins/flexWrap.js
@@ -0,0 +1,18 @@
+export default function({ variants }) {
+  return function({ addUtilities }) {
+    addUtilities(
+      {
+        '.flex-wrap': {
+          'flex-wrap': 'wrap',
+        },
+        '.flex-wrap-reverse': {
+          'flex-wrap': 'wrap-reverse',
+        },
+        '.flex-no-wrap': {
+          'flex-wrap': 'nowrap',
+        },
+      },
+      variants
+    )
+  }
+}
diff --git a/src/plugins/flexbox.js b/src/plugins/flexbox.js
index ea20686ac..e715d48bb 100644
--- a/src/plugins/flexbox.js
+++ b/src/plugins/flexbox.js
@@ -2,15 +2,6 @@ export default function({ variants }) {
   return function({ addUtilities }) {
     addUtilities(
       {
-        '.flex-wrap': {
-          'flex-wrap': 'wrap',
-        },
-        '.flex-wrap-reverse': {
-          'flex-wrap': 'wrap-reverse',
-        },
-        '.flex-no-wrap': {
-          'flex-wrap': 'nowrap',
-        },
         '.items-start': {
           'align-items': 'flex-start',
         },