diff --git a/lib/non-stupid-digest-assets.rb b/lib/non-stupid-digest-assets.rb
index f8ec3e5..9b58346 100644
--- a/lib/non-stupid-digest-assets.rb
+++ b/lib/non-stupid-digest-assets.rb
@@ -25,6 +25,11 @@ class Manifest
     def compile_with_non_digest *args
       compile_without_non_digest *args
 
+      assets_path = ::Rails.root.join('public', 'assets', 'manifest*.json')
+      manifest_files = Dir.glob(assets_path)
+      manifests = {}
+      manifest_files.each { |f| manifests[f] = File.read(f) }
+
       NonStupidDigestAssets.files(files).each do |(digest_path, info)|
         full_digest_path = File.join dir, digest_path
         full_digest_gz_path = "#{full_digest_path}.gz"
@@ -34,18 +39,36 @@ def compile_with_non_digest *args
         if File.exists? full_digest_path
           logger.debug "Writing #{full_non_digest_path}"
           FileUtils.copy_file full_digest_path, full_non_digest_path, :preserve_attributes
+          logger.info "Clearing #{full_digest_path} and modifying manifest"
+          FileUtils.rm full_digest_path
+          manifests_swap_filenames manifests, digest_path, info['logical_path']
         else
           logger.debug "Could not find: #{full_digest_path}"
         end
         if File.exists? full_digest_gz_path
           logger.debug "Writing #{full_non_digest_gz_path}"
           FileUtils.copy_file full_digest_gz_path, full_non_digest_gz_path, :preserve_attributes
+          logger.info "Clearing #{full_digest_gz_path}"
+          FileUtils.rm full_digest_gz_path
         else
           logger.debug "Could not find: #{full_digest_gz_path}"
         end
       end
+
+      manifests.each { |f, m|
+        File.open(f, 'w') do |fh|
+          fh.write m
+        end
+      }
     end
 
     alias_method_chain :compile, :non_digest
+
+    private
+    def manifests_swap_filenames manifests, old, new
+      manifests.each do |f, m|
+        m.gsub!(old, new)
+      end
+    end
   end
 end