diff --git a/Gruntfile.js b/Gruntfile.js
index 73023939e..efe5918fb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -111,9 +111,25 @@ module.exports = function (grunt) {
     },
 
     less: {
-      compile: {
+      compileCore: {
+        options: {
+          sourceMap: true,
+          outputSourceFiles: true,
+          sourceMapURL: '<%= pkg.name %>.css.map',
+          sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
+        },
+        files: {
+          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less'
+        }
+      },
+      compileTheme: {
+        options: {
+          sourceMap: true,
+          outputSourceFiles: true,
+          sourceMapURL: '<%= pkg.name %>-theme.css.map',
+          sourceMapFilename: 'dist/css/<%= pkg.name %>-theme.css.map'
+        },
         files: {
-          'dist/css/<%= pkg.name %>.css': 'less/bootstrap.less',
           'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
         }
       },
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css
index c69e37700..d8293887c 100644
--- a/dist/css/bootstrap-theme.css
+++ b/dist/css/bootstrap-theme.css
@@ -345,3 +345,4 @@
   -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
           box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
 }
+/*# sourceMappingURL=bootstrap-theme.css.map */
diff --git a/dist/css/bootstrap-theme.css.map b/dist/css/bootstrap-theme.css.map
new file mode 100644
index 000000000..db27325d9
Binary files /dev/null and b/dist/css/bootstrap-theme.css.map differ
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 261fc46de..76c16a742 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -5940,3 +5940,4 @@ td.visible-print {
     display: none !important;
   }
 }
+/*# sourceMappingURL=bootstrap.css.map */
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
new file mode 100644
index 000000000..111246d4f
Binary files /dev/null and b/dist/css/bootstrap.css.map differ