diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index b58f3a789..7bc0c87bc 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import overflow from './plugins/overflow'
 import padding from './plugins/padding'
 import pointerEvents from './plugins/pointerEvents'
 import position from './plugins/position'
@@ -19,6 +20,7 @@ import width from './plugins/width'
 import zIndex from './plugins/zIndex'
 
 export default [
+  overflow(),
   padding(),
   pointerEvents(),
   position(),
diff --git a/src/generators/overflow.js b/src/generators/overflow.js
deleted file mode 100644
index eefeb01c3..000000000
--- a/src/generators/overflow.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return defineClasses({
-    'overflow-auto': { overflow: 'auto' },
-    'overflow-hidden': { overflow: 'hidden' },
-    'overflow-visible': { overflow: 'visible' },
-    'overflow-scroll': { overflow: 'scroll' },
-    'overflow-x-auto': { 'overflow-x': 'auto' },
-    'overflow-y-auto': { 'overflow-y': 'auto' },
-    'overflow-x-hidden': { 'overflow-x': 'hidden' },
-    'overflow-y-hidden': { 'overflow-y': 'hidden' },
-    'overflow-x-visible': { 'overflow-x': 'visible' },
-    'overflow-y-visible': { 'overflow-y': 'visible' },
-    'overflow-x-scroll': { 'overflow-x': 'scroll' },
-    'overflow-y-scroll': { 'overflow-y': 'scroll' },
-    'scrolling-touch': { '-webkit-overflow-scrolling': 'touch' },
-    'scrolling-auto': { '-webkit-overflow-scrolling': 'auto' },
-  })
-}
diff --git a/src/plugins/overflow.js b/src/plugins/overflow.js
new file mode 100644
index 000000000..37dd6f2b7
--- /dev/null
+++ b/src/plugins/overflow.js
@@ -0,0 +1,20 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+      '.overflow-auto': { overflow: 'auto' },
+      '.overflow-hidden': { overflow: 'hidden' },
+      '.overflow-visible': { overflow: 'visible' },
+      '.overflow-scroll': { overflow: 'scroll' },
+      '.overflow-x-auto': { 'overflow-x': 'auto' },
+      '.overflow-y-auto': { 'overflow-y': 'auto' },
+      '.overflow-x-hidden': { 'overflow-x': 'hidden' },
+      '.overflow-y-hidden': { 'overflow-y': 'hidden' },
+      '.overflow-x-visible': { 'overflow-x': 'visible' },
+      '.overflow-y-visible': { 'overflow-y': 'visible' },
+      '.overflow-x-scroll': { 'overflow-x': 'scroll' },
+      '.overflow-y-scroll': { 'overflow-y': 'scroll' },
+      '.scrolling-touch': { '-webkit-overflow-scrolling': 'touch' },
+      '.scrolling-auto': { '-webkit-overflow-scrolling': 'auto' },
+    }, config('modules.overflow'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 5590e766b..c8730d510 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -28,7 +28,6 @@ import objectFit from './generators/objectFit'
 import objectPosition from './generators/objectPosition'
 import opacity from './generators/opacity'
 import outline from './generators/outline'
-import overflow from './generators/overflow'
 
 export default [
   { name: 'lists', generator: lists },
@@ -61,5 +60,4 @@ export default [
   { name: 'objectPosition', generator: objectPosition },
   { name: 'opacity', generator: opacity },
   { name: 'outline', generator: outline },
-  { name: 'overflow', generator: overflow },
 ]