diff --git a/__tests__/fixtures/tailwind.css b/__tests__/fixtures/tailwind.css
index 928a2335e..137af02a8 100644
--- a/__tests__/fixtures/tailwind.css
+++ b/__tests__/fixtures/tailwind.css
@@ -3120,6 +3120,10 @@ button,
   align-items: stretch;
 }
 
+.self-auto {
+  align-self: auto;
+}
+
 .self-start {
   align-self: flex-start;
 }
@@ -5870,6 +5874,10 @@ button,
     align-items: stretch;
   }
 
+  .sm\:self-auto {
+    align-self: auto;
+  }
+
   .sm\:self-start {
     align-self: flex-start;
   }
@@ -8621,6 +8629,10 @@ button,
     align-items: stretch;
   }
 
+  .md\:self-auto {
+    align-self: auto;
+  }
+
   .md\:self-start {
     align-self: flex-start;
   }
@@ -11372,6 +11384,10 @@ button,
     align-items: stretch;
   }
 
+  .lg\:self-auto {
+    align-self: auto;
+  }
+
   .lg\:self-start {
     align-self: flex-start;
   }
@@ -14123,6 +14139,10 @@ button,
     align-items: stretch;
   }
 
+  .xl\:self-auto {
+    align-self: auto;
+  }
+
   .xl\:self-start {
     align-self: flex-start;
   }
diff --git a/src/generators/flex.js b/src/generators/flex.js
index 46148af72..9f67b7352 100644
--- a/src/generators/flex.js
+++ b/src/generators/flex.js
@@ -44,6 +44,9 @@ export default function() {
     'items-stretch': {
       'align-items': 'stretch',
     },
+    'self-auto': {
+      'align-self': 'auto',
+    },
     'self-start': {
       'align-self': 'flex-start',
     },