diff --git a/Gruntfile.js b/Gruntfile.js
index 66eb0d2..28999dc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,7 +50,7 @@ module.exports = function(grunt) {
             },
             rename: {
                 options: {
-                    baseDir: 'tmp/',
+                    baseDir: './tmp',
                     deleteOriginals: true,
                     jsonOutput: 'output/replace-cachebuster-map.json',
                     replaceTerms: [{
diff --git a/tasks/cachebust.js b/tasks/cachebust.js
index c6007ec..a15948a 100644
--- a/tasks/cachebust.js
+++ b/tasks/cachebust.js
@@ -196,15 +196,12 @@ module.exports = function(grunt) {
                 findStaticAssets(markup, filters, isCSS).forEach(function(reference) {
                     var newFilename;
                     var newFilePath;
+                    var newReference;
 
                     var filePath = (opts.baseDir ? opts.baseDir : path.dirname(filepath)) + '/';
                     var filename = path.normalize((filePath + reference).split('?')[0]);
                     var extension = path.extname(filename);
 
-                    if(opts.dir) {
-                        filename = opts.dir + filename;
-                    }
-
                     if(opts.ignorePatterns) {
                         var matched = opts.ignorePatterns.some(function(pattern) {
                             return new RegExp(pattern, 'ig').test(filename);
@@ -245,19 +242,23 @@ module.exports = function(grunt) {
                             // Create our new filename
                             newFilename = addHash(filename, hash, extension);
 
+                            // Create the new reference
+                            newReference = addHash(reference.replace(hashReplaceRegex, ''), hash, extension);
+
                             // Update the reference in the markup
-                            markup = markup.replace(new RegExp(regexEscape(reference), 'g'), addHash(reference.replace(hashReplaceRegex, ''), hash, extension));
+                            markup = markup.replace(new RegExp(regexEscape(reference), 'g'), newReference);
 
                             // Create our new file
                             grunt.file.copy(filename, newFilename);
                         }
                     } else {
                         newFilename = reference.split('?')[0] + '?' + generateHash(grunt.file.read(filename));
+                        newReference = newFilename;
                         markup = markup.replace(new RegExp(regexEscape(reference), 'g'), newFilename);
                     }
 
                     if(newFilename) {
-                        processedFileMap[filename] = newFilename.replace(opts.baseDir, '');
+                        processedFileMap[filename] = newReference;
                     }
                 });
 
@@ -281,7 +282,7 @@ module.exports = function(grunt) {
             var name = typeof opts.jsonOutput === 'string' ? opts.jsonOutput : opts.jsonOutputFilename;
 
             grunt.log.writeln(['File map has been exported to ', opts.baseDir+name, '!'].join(''));
-            grunt.file.write(opts.baseDir + name, JSON.stringify(processedFileMap));
+            grunt.file.write(path.normalize(opts.baseDir +'/'+ name), JSON.stringify(processedFileMap));
         }
     });
 
diff --git a/test/fixtures/replace.html b/test/fixtures/replace.html
index 88c1441..eee1bbd 100644
--- a/test/fixtures/replace.html
+++ b/test/fixtures/replace.html
@@ -15,7 +15,7 @@ <h3>Heard what??</h3>
 
     <h1>THE BIRD IS THE WORD!!</h1>
 
-    <script defer src="assets/replace.js" type="text/javascript"></script>
+    <script defer src="/assets/replace.js" type="text/javascript"></script>
 
 </body>
 </html>
diff --git a/test/fixtures/standard.html b/test/fixtures/standard.html
index 9617d81..e00f9d5 100644
--- a/test/fixtures/standard.html
+++ b/test/fixtures/standard.html
@@ -15,7 +15,7 @@ <h3>Heard what??</h3>
 
     <h1>THE BIRD IS THE WORD!!</h1>
 
-    <script defer src="assets/standard.js" type="text/javascript"></script>
+    <script defer src="/assets/standard.js" type="text/javascript"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>