diff --git a/package.json b/package.json
index 4e3890be19f..75136e48f1a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-htmlmin": "~0.1.3",
+    "grunt-contrib-htmlmin": "~0.6.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-requirejs": "~0.4.4",
diff --git a/public/views/index.html b/public/views/index.html
index 5b4e2f5bd92..b9a1bc3c825 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -9,15 +9,15 @@
     <title>Grafana</title>
 
 		[[if .User.LightTheme]]
-		  <link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css">
+		  <link rel="stylesheet" href="[[.AppSubUrl]]/public/css/grafana.light.min.css">
 		[[else]]
-		  <link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.dark.min.css">
+		  <link rel="stylesheet" href="[[.AppSubUrl]]/public/css/grafana.dark.min.css">
 		[[end]]
 
-    <link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
+    <link rel="icon" type="image/png" href="[[.AppSubUrl]]/public/img/fav32.png">
 		<base href="[[.AppSubUrl]]/" />
 
-		<!-- build:js [[.AppSubUrl]]/app/app.js -->
+		<!-- build:js [[.AppSubUrl]]/public/app/app.js -->
     <script src="[[.AppSubUrl]]/public/vendor/requirejs/require.js"></script>
     <script src="[[.AppSubUrl]]/public/app/require_config.js"></script>
     <!-- endbuild -->
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 7773299a06d..54562dfbde1 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
     'karma:test',
     'phantomjs',
     'css',
-    'htmlmin:build',
+    // 'htmlmin:build',
     'ngtemplates',
     'cssmin:build',
     'ngAnnotate:build',
@@ -34,8 +34,8 @@ module.exports = function(grunt) {
 
     for(var key in summary){
       if(summary.hasOwnProperty(key)){
-        var orig = key.replace(root, root+'/[[.AppSubUrl]]');
-        var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]');
+        var orig = key.replace(root, root+'/[[.AppSubUrl]]/public');
+        var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]/public');
         fixed[orig] = revved;
       }
     }
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index c15aa8a2d6e..4e6927b306a 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -27,7 +27,7 @@ module.exports = function(config) {
     js: {
       src: [
         '<%= tempDir %>/vendor/requirejs/require.js',
-        '<%= tempDir %>/app/components/require.config.js',
+        '<%= tempDir %>/app/require_config.js',
         '<%= tempDir %>/app/app.js',
       ],
       dest: '<%= genDir %>/app/app.js'