diff --git a/Gruntfile.js b/Gruntfile.js
index b2f702e4e5..b49cdce50c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -212,6 +212,7 @@ module.exports = function (grunt) {
           map: true,
           processors: [
             mq4HoverShim.postprocessorFor({ hoverSelectorPrefix: '.bs-true-hover ' }),
+            require('postcss-flexbugs-fixes')(),
             autoprefixer
           ]
         },
diff --git a/docs/getting-started/download.md b/docs/getting-started/download.md
index 1fa524eb55..7ee6feceec 100644
--- a/docs/getting-started/download.md
+++ b/docs/getting-started/download.md
@@ -21,7 +21,7 @@ Download just the compiled and minified CSS and JavaScript. Doesn't include any
   <div class="col-sm-6">
 {% markdown %}
 ### Source files
-Download everything: source Sass, JavaScript, and documentation files. **Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup]({{ site.baseurl }}/getting-started/build-tools/#tooling-setup).**
+Download everything: source Sass, JavaScript, and documentation files. **Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes), and [some setup]({{ site.baseurl }}/getting-started/build-tools/#tooling-setup).**
 
 <a href="{{ site.download.source }}" class="btn btn-bs btn-outline" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
 {% endmarkdown %}
@@ -30,7 +30,7 @@ Download everything: source Sass, JavaScript, and documentation files. **Require
 
 ## Package managers
 
-Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler and [Autoprefixer](https://github.com/postcss/autoprefixer)** for a setup that matches our official compiled versions.
+Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes)** for a setup that matches our official compiled versions.
 
 {% callout warning %}
 **Heads up!** Not all package managers have the v4 alpha published yet, but we should have them up shortly!
diff --git a/docs/getting-started/flexbox.md b/docs/getting-started/flexbox.md
index f8ab4e8aed..9c0f1a8762 100644
--- a/docs/getting-started/flexbox.md
+++ b/docs/getting-started/flexbox.md
@@ -19,7 +19,7 @@ Flexbox support is available for a number of Bootstrap's components:
 - Input groups, which move from `display: table;` to `display: flex;`.
 - The media component moves from `display: table;` and a number of hacky styles to a simple `display: flex;`.
 
-Vendor prefixes are provided in our compiled CSS with Autoprefixer via Grunt.
+Vendor prefixes are provided in our compiled CSS with [Autoprefixer](https://github.com/postcss/autoprefixer) via Grunt. Some bugs in IE10-11's Flexbox implementation are worked around via [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes).
 
 ## Why flexbox?
 
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index e3b0b11525..500421949b 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -2641,6 +2641,11 @@
       "from": "postcss@>=5.0.19 <6.0.0",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.21.tgz"
     },
+    "postcss-flexbugs-fixes": {
+      "version": "2.0.0",
+      "from": "postcss-flexbugs-fixes@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-2.0.0.tgz"
+    },
     "postcss-value-parser": {
       "version": "3.3.0",
       "from": "postcss-value-parser@>=3.2.3 <4.0.0",
diff --git a/package.json b/package.json
index 5afbef6293..f8e4141489 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "is-travis": "^1.0.0",
     "load-grunt-tasks": "^3.4.0",
     "mq4-hover-shim": "^0.3.0",
+    "postcss-flexbugs-fixes": "^2.0.0",
     "shelljs": "^0.6.0",
     "time-grunt": "^1.2.1"
   },