diff --git a/package-lock.json b/package-lock.json
index bc5c6b5fc1eb3294a947e336e2bed1a8b900779f..3d694099943df312136c0b0dafa4ac0363bd3ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1679,6 +1679,24 @@
       "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
       "dev": true
     },
+    "css-mqpacker": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/css-mqpacker/-/css-mqpacker-6.0.1.tgz",
+      "integrity": "sha512-pQ40tp4ooLopvkYA8YfQdDAAnoPToP5a3tdOWn6A4VwaJ6tGJLvyC3UEfmfsw9DbX2Ofgk4WBIVW3EZmNYvLYQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0",
+        "postcss": "6.0.13"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
diff --git a/package.json b/package.json
index ba56a1d423095ba881ad131abef27e8e865d916c..4774948d55923ab66280add27fff923eab8121db 100644
--- a/package.json
+++ b/package.json
@@ -19,17 +19,17 @@
   "scripts": {
     "bash": "bash",
     "bundlesize": "bundlesize",
-    "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*",
-    "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify",
-    "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs",
+    "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-postcss* css-minify*",
+    "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-postcss css-minify",
+    "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-postcss-docs css-minify-docs",
     "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css",
     "css-lint": "stylelint --config build/.stylelintrc --syntax scss \"scss/**/*.scss\"",
     "css-lint-docs": "stylelint --config build/.stylelintrc --syntax scss \"assets/scss/*.scss\" && stylelint --config docs/4.0/examples/.stylelintrc \"docs/**/*.css\"",
-    "css-prefix": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\"",
-    "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"assets/css/docs.min.css\" \"docs/**/*.css\"",
-    "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
-    "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css",
+    "css-postcss": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\"",
+    "css-postcss-docs": "postcss --config build/postcss.config.js --replace \"assets/css/docs.min.css\" \"docs/**/*.css\"",
+    "css-minify": "postcss dist/css/bootstrap.css --use \"css-mqpacker\" -o dist/css/bootstrap.min.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.min.css && postcss dist/css/bootstrap-grid.css --use \"css-mqpacker\" -o dist/css/bootstrap-grid.min.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.min.css && postcss dist/css/bootstrap-reboot.css --use \"css-mqpacker\" -o dist/css/bootstrap-reboot.min.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.min.css",
+    "css-minify-docs": "postcss assets/css/docs.min.css --config build/postcss.config.js --use \"css-mqpacker\" -o assets/css/docs.min.css && cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css",
     "js": "npm-run-all js-lint* js-compile* js-minify*",
     "js-main": "npm-run-all js-lint js-compile js-minify",
     "js-docs": "npm-run-all js-lint-docs js-minify-docs",
@@ -88,6 +88,7 @@
     "bundlesize": "^0.15.2",
     "clean-css-cli": "^4.1.6",
     "cross-env": "^5.0.5",
+    "css-mqpacker": "^6.0.1",
     "eslint": "^4.2.0",
     "eslint-plugin-compat": "^2.0.1",
     "htmllint-cli": "^0.0.6",