diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index 80f04b802cf6..a05673c55015 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -2096,6 +2096,10 @@ button,
   border-color: #ffebef;
 }
 
+.border-solid {
+  border-style: solid;
+}
+
 .border-dashed {
   border-style: dashed;
 }
@@ -5060,6 +5064,10 @@ button,
     border-color: #ffebef;
   }
 
+  .sm\:border-solid {
+    border-style: solid;
+  }
+
   .sm\:border-dashed {
     border-style: dashed;
   }
@@ -8025,6 +8033,10 @@ button,
     border-color: #ffebef;
   }
 
+  .md\:border-solid {
+    border-style: solid;
+  }
+
   .md\:border-dashed {
     border-style: dashed;
   }
@@ -10990,6 +11002,10 @@ button,
     border-color: #ffebef;
   }
 
+  .lg\:border-solid {
+    border-style: solid;
+  }
+
   .lg\:border-dashed {
     border-style: dashed;
   }
@@ -13955,6 +13971,10 @@ button,
     border-color: #ffebef;
   }
 
+  .xl\:border-solid {
+    border-style: solid;
+  }
+
   .xl\:border-dashed {
     border-style: dashed;
   }
diff --git a/docs/source/docs/border-style.blade.md b/docs/source/docs/border-style.blade.md
index 0cf9f96ba7dd..2915da67c318 100644
--- a/docs/source/docs/border-style.blade.md
+++ b/docs/source/docs/border-style.blade.md
@@ -22,19 +22,24 @@ features:
     </thead>
     <tbody class="align-baseline">
       <tr>
-        <td class="p-2 border-t border-smoke font-mono text-xs text-purple-dark">.border-dashed</td>
-        <td class="p-2 border-t border-smoke font-mono text-xs text-blue-dark">border-style: dashed;</td>
-        <td class="p-2 border-t border-smoke text-sm text-grey-darker">Sets the border style on an element to dashed.</td>
+          <td class="p-2 border-t border-smoke font-mono text-xs text-purple-dark">.border-solid</td>
+          <td class="p-2 border-t border-smoke font-mono text-xs text-blue-dark">border-style: solid;</td>
+          <td class="p-2 border-t border-smoke text-sm text-grey-darker">Sets the border style on an element to solid.</td>
       </tr>
       <tr>
-        <td class="p-2 border-t border-smoke-light font-mono text-xs text-purple-dark">.border-dotted</td>
-        <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">border-style: dotted;</td>
-        <td class="p-2 border-t border-smoke-light text-sm text-grey-darker">Sets the border style on an element to dotted.</td>
+          <td class="p-2 border-t border-smoke font-mono text-xs text-purple-dark">.border-dashed</td>
+          <td class="p-2 border-t border-smoke font-mono text-xs text-blue-dark">border-style: dashed;</td>
+          <td class="p-2 border-t border-smoke text-sm text-grey-darker">Sets the border style on an element to dashed.</td>
       </tr>
       <tr>
-        <td class="p-2 border-t border-smoke-light font-mono text-xs text-purple-dark">.border-none</td>
-        <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">border-style: none;</td>
-        <td class="p-2 border-t border-smoke-light text-sm text-grey-darker">Disables the border on an element.</td>
+          <td class="p-2 border-t border-smoke-light font-mono text-xs text-purple-dark">.border-dotted</td>
+          <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">border-style: dotted;</td>
+          <td class="p-2 border-t border-smoke-light text-sm text-grey-darker">Sets the border style on an element to dotted.</td>
+      </tr>
+      <tr>
+          <td class="p-2 border-t border-smoke-light font-mono text-xs text-purple-dark">.border-none</td>
+          <td class="p-2 border-t border-smoke-light font-mono text-xs text-blue-dark">border-style: none;</td>
+          <td class="p-2 border-t border-smoke-light text-sm text-grey-darker">Disables the border on an element.</td>
       </tr>
     </tbody>
   </table>
diff --git a/src/generators/borderStyles.js b/src/generators/borderStyles.js
index 8151a1bb51ca..3dfca388c490 100644
--- a/src/generators/borderStyles.js
+++ b/src/generators/borderStyles.js
@@ -2,6 +2,9 @@ import defineClasses from '../util/defineClasses'
 
 export default function() {
   return defineClasses({
+    'border-solid': {
+      'border-style': 'solid',
+    },
     'border-dashed': {
       'border-style': 'dashed',
     },