diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index a1a1a533e..54f03a2d2 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -1311,6 +1311,14 @@ table {
   background-size: contain;
 }
 
+.border-collapse {
+  border-collapse: collapse;
+}
+
+.border-separate {
+  border-collapse: separate;
+}
+
 .border-transparent {
   border-color: transparent;
 }
diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index b2cf9fc6e..967304833 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -842,6 +842,7 @@ module.exports = {
     backgroundPosition: ['responsive'],
     backgroundRepeat: ['responsive'],
     backgroundSize: ['responsive'],
+    borderCollapse: [],
     borderColors: ['responsive', 'hover'],
     borderRadius: ['responsive'],
     borderStyle: ['responsive'],
diff --git a/src/generators/borderCollapse.js b/src/generators/borderCollapse.js
new file mode 100644
index 000000000..321c89742
--- /dev/null
+++ b/src/generators/borderCollapse.js
@@ -0,0 +1,8 @@
+import defineClasses from '../util/defineClasses'
+
+export default function() {
+  return defineClasses({
+    'border-collapse': { 'border-collapse': 'collapse' },
+    'border-separate': { 'border-collapse': 'separate' },
+  })
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index d22b9a6c4..f6f124896 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -5,6 +5,7 @@ import backgroundColors from './generators/backgroundColors'
 import backgroundPosition from './generators/backgroundPosition'
 import backgroundRepeat from './generators/backgroundRepeat'
 import backgroundSize from './generators/backgroundSize'
+import borderCollapse from './generators/borderCollapse'
 import borderColors from './generators/borderColors'
 import borderRadius from './generators/borderRadius'
 import borderStyle from './generators/borderStyle'
@@ -52,6 +53,7 @@ export default [
   { name: 'backgroundPosition', generator: backgroundPosition },
   { name: 'backgroundRepeat', generator: backgroundRepeat },
   { name: 'backgroundSize', generator: backgroundSize },
+  { name: 'borderCollapse', generator: borderCollapse },
   { name: 'borderColors', generator: borderColors },
   { name: 'borderRadius', generator: borderRadius },
   { name: 'borderStyle', generator: borderStyle },