diff --git a/Gruntfile.js b/Gruntfile.js
index 9549ed02d9..fdf4d86b03 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -393,6 +393,15 @@ module.exports = function(grunt) {
 					'wp-includes/js/mediaelement/wp-mediaelement.css'
 				]
 			},
+			dist: {
+				expand: true,
+				cwd: BUILD_DIR,
+				dest: BUILD_DIR,
+				ext: '.min.css',
+				src: [
+					'wp-includes/css/dist/*/*.css'
+				]
+			},
 			rtl: {
 				expand: true,
 				cwd: BUILD_DIR,
@@ -1364,6 +1373,7 @@ module.exports = function(grunt) {
 		'usebanner',
 		'webpack:prod',
 		'webpack:devProdTarget',
+		'cssmin:dist',
 		'jsvalidate:build'
 	] );
 
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 245d12d687..d17b769773 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -1852,12 +1852,12 @@ function wp_default_styles( &$styles ) {
 	}
 	$styles->add( 'wp-editor-font', $fonts_url );
 
-	$styles->add( 'wp-block-library-theme', '/wp-includes/css/dist/block-library/theme.css' );
+	$styles->add( 'wp-block-library-theme', "/wp-includes/css/dist/block-library/theme$suffix.css" );
 	$styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' );
 
 	$styles->add(
 		'wp-edit-blocks',
-		'/wp-includes/css/dist/block-library/editor.css',
+		"/wp-includes/css/dist/block-library/editor$suffix.css",
 		array(
 			'wp-components',
 			'wp-editor',
@@ -1879,7 +1879,7 @@ function wp_default_styles( &$styles ) {
 
 	foreach ( $package_styles as $package => $dependencies ) {
 		$handle = 'wp-' . $package;
-		$path   = '/wp-includes/css/dist/' . $package . '/style.css';
+		$path   = "/wp-includes/css/dist/$package/style$suffix.css";
 
 		$styles->add( $handle, $path, $dependencies );
 		$styles->add_data( $handle, 'rtl', 'replace' );