diff --git a/app.js b/app.js
index f308b56d50..65cc06af30 100644
--- a/app.js
+++ b/app.js
@@ -280,9 +280,9 @@ function build(targets, callback) {
 	var db = require('./src/database');
 	var meta = require('./src/meta');
 	var plugins = require('./src/plugins');
-	var valid = ['js', 'css', 'tpl'];
+	var valid = ['js', 'clientCSS', 'acpCSS', 'tpl'];
 	var step = function (target, next) {
-		winston.info('[build] Build step completed in ' + ((Date.now() - startTime) / 1000) + 's');
+		winston.info('[build]  => Completed in ' + ((Date.now() - startTime) / 1000) + 's');
 		next();
 	};
 	var startTime;
@@ -318,10 +318,16 @@ function build(targets, callback) {
 					], step.bind(this, target, next));
 					break;
 
-				case 'css':
-					winston.info('[build] Building CSS stylesheets');
+				case 'clientCSS':
+					winston.info('[build] Building client-side CSS');
 					startTime = Date.now();
-					meta.css.minify(step.bind(this, target, next));
+					meta.css.minify('stylesheet.css', step.bind(this, target, next));
+					break;
+
+				case 'acpCSS':
+					winston.info('[build] Building admin control panel CSS');
+					startTime = Date.now();
+					meta.css.minify('admin.css', step.bind(this, target, next));
 					break;
 
 				case 'tpl':
diff --git a/src/meta/css.js b/src/meta/css.js
index 1e0cbc6b56..583927e04a 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -21,7 +21,7 @@ module.exports = function (Meta) {
 	Meta.css.cache = undefined;
 	Meta.css.acpCache = undefined;
 
-	Meta.css.minify = function (callback) {
+	Meta.css.minify = function (target, callback) {
 		callback = callback || function () {};
 
 		winston.verbose('[meta/css] Minifying LESS/CSS');
@@ -61,27 +61,26 @@ module.exports = function (Meta) {
 
 				var acpSource = source;
 
-				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";';
-				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
-				source += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
-				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";';
-				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/blacklist.less";';
-				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";';
-				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";';
-				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/global.less";';
-				source = '@import "./theme";\n' + source;
-
-				acpSource += '\n@import "..' + path.sep + 'public/less/admin/admin";\n';
-				acpSource += '\n@import "..' + path.sep + 'public/less/generics.less";\n';
-				acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";\n';
-				acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";';
-
-				async.series([
-					async.apply(minify, source, paths, 'cache'),
-					async.apply(minify, acpSource, paths, 'acpCache')
-				], function (err) {
-					callback(err);
-				});
+				if (target !== 'admin.css') {
+					source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";';
+					source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
+					source += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
+					source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";';
+					source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/blacklist.less";';
+					source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";';
+					source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";';
+					source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/global.less";';
+					source = '@import "./theme";\n' + source;
+
+					minify(source, paths, 'cache', callback);
+				} else {
+					acpSource += '\n@import "..' + path.sep + 'public/less/admin/admin";\n';
+					acpSource += '\n@import "..' + path.sep + 'public/less/generics.less";\n';
+					acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";\n';
+					acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";';
+
+					minify(acpSource, paths, 'acpCache', callback);
+				}
 			});
 		});
 	};