diff --git a/lib/tasks/requirejs-rails_tasks.rake b/lib/tasks/requirejs-rails_tasks.rake
index 72917782..e10b6739 100644
--- a/lib/tasks/requirejs-rails_tasks.rake
+++ b/lib/tasks/requirejs-rails_tasks.rake
@@ -162,7 +162,7 @@ OS X Homebrew users can use 'brew install node'.
         built_asset_path = requirejs.config.build_dir.join(asset_name)
 
         # Compute the digest based on the contents of the compiled file, *not* on the contents of the RequireJS module.
-        file_digest = ::Rails.application.assets.file_digest(built_asset_path.to_s)
+        file_digest = requirejs.env.file_digest(built_asset_path.to_s)
         hex_digest = file_digest.unpack("H*").first
         digest_name = asset.logical_path.gsub(path_extension_pattern) { |ext| "-#{hex_digest}#{ext}" }
 
@@ -174,13 +174,15 @@ OS X Homebrew users can use 'brew install node'.
         requirejs.manifest[module_script_name] = digest_name
         FileUtils.cp built_asset_path, digest_asset_path
 
-        # Create the compressed versions
-        File.open("#{built_asset_path}.gz", 'wb') do |f|
-          zgw = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
-          zgw.write built_asset_path.read
-          zgw.close
+        # Create the compressed versions if gzip is not disabled
+        if !requirejs.env.respond_to?(:gzip?) || requirejs.env.gzip?
+          File.open("#{built_asset_path}.gz", 'wb') do |f|
+            zgw = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+            zgw.write built_asset_path.read
+            zgw.close
+          end
+          FileUtils.cp "#{built_asset_path}.gz", "#{digest_asset_path}.gz"
         end
-        FileUtils.cp "#{built_asset_path}.gz", "#{digest_asset_path}.gz"
 
         requirejs.config.manifest_path.open('wb') do |f|
           YAML.dump(requirejs.manifest, f)