diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index 4467c42a8..7e5cbdb74 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -4916,6 +4916,14 @@ table {
   stroke: currentColor;
 }
 
+.table-auto {
+  table-layout: auto;
+}
+
+.table-fixed {
+  table-layout: fixed;
+}
+
 .text-left {
   text-align: left;
 }
@@ -10477,6 +10485,14 @@ table {
     box-shadow: none;
   }
 
+  .sm\:table-auto {
+    table-layout: auto;
+  }
+
+  .sm\:table-fixed {
+    table-layout: fixed;
+  }
+
   .sm\:text-left {
     text-align: left;
   }
@@ -16039,6 +16055,14 @@ table {
     box-shadow: none;
   }
 
+  .md\:table-auto {
+    table-layout: auto;
+  }
+
+  .md\:table-fixed {
+    table-layout: fixed;
+  }
+
   .md\:text-left {
     text-align: left;
   }
@@ -21601,6 +21625,14 @@ table {
     box-shadow: none;
   }
 
+  .lg\:table-auto {
+    table-layout: auto;
+  }
+
+  .lg\:table-fixed {
+    table-layout: fixed;
+  }
+
   .lg\:text-left {
     text-align: left;
   }
@@ -27163,6 +27195,14 @@ table {
     box-shadow: none;
   }
 
+  .xl\:table-auto {
+    table-layout: auto;
+  }
+
+  .xl\:table-fixed {
+    table-layout: fixed;
+  }
+
   .xl\:text-left {
     text-align: left;
   }
diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 419e3da57..5d680880c 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -896,6 +896,7 @@ module.exports = {
     shadows: ['responsive', 'hover', 'focus'],
     svgFill: [],
     svgStroke: [],
+    tableLayout: ['responsive'],
     textAlign: ['responsive'],
     textColors: ['responsive', 'hover', 'focus'],
     textSizes: ['responsive'],
diff --git a/src/generators/tableLayout.js b/src/generators/tableLayout.js
new file mode 100644
index 000000000..5aa0c8554
--- /dev/null
+++ b/src/generators/tableLayout.js
@@ -0,0 +1,8 @@
+import defineClasses from '../util/defineClasses'
+
+export default function() {
+  return defineClasses({
+    'table-auto': { 'table-layout': 'auto' },
+    'table-fixed': { 'table-layout': 'fixed' },
+  })
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 671180556..fd5aa154a 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -34,6 +34,7 @@ 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'
 import textAlign from './generators/textAlign'
 import textColors from './generators/textColors'
 import textSizes from './generators/textSizes'
@@ -83,6 +84,7 @@ export default [
   { name: 'shadows', generator: shadows },
   { name: 'svgFill', generator: svgFill },
   { name: 'svgStroke', generator: svgStroke },
+  { name: 'tableLayout', generator: tableLayout },
   { name: 'textAlign', generator: textAlign },
   { name: 'textColors', generator: textColors },
   { name: 'textSizes', generator: textSizes },