diff --git a/__tests__/variantsAtRule.test.js b/__tests__/variantsAtRule.test.js
index 4f40c991767d..bc8391c14cc3 100644
--- a/__tests__/variantsAtRule.test.js
+++ b/__tests__/variantsAtRule.test.js
@@ -70,6 +70,27 @@ test('it can generate focus variants', () => {
   })
 })
 
+test('it can generate focus-within variants', () => {
+  const input = `
+    @variants focus-within {
+      .banana { color: yellow; }
+      .chocolate { color: brown; }
+    }
+  `
+
+  const output = `
+      .banana { color: yellow; }
+      .chocolate { color: brown; }
+      .focus-within\\:banana:focus-within { color: yellow; }
+      .focus-within\\:chocolate:focus-within { color: brown; }
+  `
+
+  return run(input).then(result => {
+    expect(result.css).toMatchCss(output)
+    expect(result.warnings().length).toBe(0)
+  })
+})
+
 test('it can generate group-hover variants', () => {
   const input = `
     @variants group-hover {
diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 5d680880c8fb..d7d0a612d397 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -852,6 +852,7 @@ module.exports = {
   |   - responsive
   |   - hover
   |   - focus
+  |   - focus-within
   |   - active
   |   - group-hover
   |
diff --git a/src/lib/substituteVariantsAtRules.js b/src/lib/substituteVariantsAtRules.js
index 60df8a258f44..1394e44819d9 100644
--- a/src/lib/substituteVariantsAtRules.js
+++ b/src/lib/substituteVariantsAtRules.js
@@ -17,6 +17,7 @@ const defaultVariantGenerators = {
     })
   }),
   hover: generatePseudoClassVariant('hover'),
+  'focus-within': generatePseudoClassVariant('focus-within'),
   focus: generatePseudoClassVariant('focus'),
   active: generatePseudoClassVariant('active'),
 }
@@ -44,7 +45,7 @@ export default function(config, { variantGenerators: pluginVariantGenerators })
           variantGenerators[variant](atRule, config)
         })
       } else {
-        _.forEach(['group-hover', 'hover', 'focus', 'active'], variant => {
+        _.forEach(['group-hover', 'hover', 'focus-within', 'focus', 'active'], variant => {
           if (variants.includes(variant)) {
             variantGenerators[variant](atRule, config)
           }