diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index 9f9d7a927..f276acf9d 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import tableLayout from './plugins/tableLayout'
 import textAlign from './plugins/textAlign'
 import textColors from './plugins/textColors'
 import textSizes from './plugins/textSizes'
@@ -11,6 +12,7 @@ import width from './plugins/width'
 import zIndex from './plugins/zIndex'
 
 export default [
+  tableLayout(),
   textAlign(),
   textColors(),
   textSizes(),
diff --git a/src/generators/tableLayout.js b/src/generators/tableLayout.js
deleted file mode 100644
index 5aa0c8554..000000000
--- a/src/generators/tableLayout.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return defineClasses({
-    'table-auto': { 'table-layout': 'auto' },
-    'table-fixed': { 'table-layout': 'fixed' },
-  })
-}
diff --git a/src/plugins/tableLayout.js b/src/plugins/tableLayout.js
new file mode 100644
index 000000000..572481b2c
--- /dev/null
+++ b/src/plugins/tableLayout.js
@@ -0,0 +1,8 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+      '.table-auto': { 'table-layout': 'auto' },
+      '.table-fixed': { 'table-layout': 'fixed' },
+    }, config('modules.tableLayout'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 1e37ad346..6cee5c8c3 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -36,7 +36,6 @@ import resize from './generators/resize'
 import shadows from './generators/shadows'
 import svgFill from './generators/svgFill'
 import svgStroke from './generators/svgStroke'
-import tableLayout from './generators/tableLayout'
 
 export default [
   { name: 'lists', generator: lists },
@@ -77,5 +76,4 @@ export default [
   { name: 'shadows', generator: shadows },
   { name: 'svgFill', generator: svgFill },
   { name: 'svgStroke', generator: svgStroke },
-  { name: 'tableLayout', generator: tableLayout },
 ]