diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
index 8d65da70..26a4aa0b 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java
@@ -27,12 +27,21 @@ package net.fabricmc.loom.task;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import net.fabricmc.loom.util.*;
 import org.gradle.api.Project;
 import org.gradle.api.file.RegularFileProperty;
@@ -50,6 +59,7 @@ import net.fabricmc.stitch.util.Pair;
 import net.fabricmc.tinyremapper.OutputConsumerPath;
 import net.fabricmc.tinyremapper.TinyRemapper;
 import net.fabricmc.tinyremapper.TinyUtils;
+import org.zeroturnaround.zip.transform.ZipEntryTransformerEntry;
 
 public class RemapJarTask extends Jar {
 	private final RegularFileProperty input;
@@ -147,6 +157,28 @@ public class RemapJarTask extends Jar {
 		if (MixinRefmapHelper.addRefmapName(extension.getRefmapName(), extension.getMixinJsonVersion(), output)) {
 			project.getLogger().debug("Transformed mixin reference maps in output JAR!");
 		}
+		
+		if (extension.isForge()) {
+			try (FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + output.toUri()), ImmutableMap.of("create", false))) {
+				Path refmapPath = fs.getPath(extension.getRefmapName());
+				
+				if (Files.exists(refmapPath)) {
+					try (Reader refmapReader = Files.newBufferedReader(refmapPath, StandardCharsets.UTF_8)) {
+						JsonObject refmapElement = new JsonParser().parse(refmapReader).getAsJsonObject().deepCopy();
+						Files.delete(refmapPath);
+						if (refmapElement.has("data")) {
+							JsonObject data = refmapElement.get("data").getAsJsonObject();
+							
+							if (data.has("named:intermediary")) {
+								data.add("searge", data.get("named:intermediary").deepCopy());
+								data.remove("named:intermediary");
+							}
+						}
+						Files.write(refmapPath, new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(refmapElement).getBytes(StandardCharsets.UTF_8));
+					}
+				}
+			}
+		}
 
 		if (getAddNestedDependencies().getOrElse(false)) {
 			if (NestedJars.addNestedJars(project, output)) {
diff --git a/src/main/java/net/fabricmc/loom/util/mixin/AnnotationProcessorInvoker.java b/src/main/java/net/fabricmc/loom/util/mixin/AnnotationProcessorInvoker.java
index c62742eb..8feba505 100644
--- a/src/main/java/net/fabricmc/loom/util/mixin/AnnotationProcessorInvoker.java
+++ b/src/main/java/net/fabricmc/loom/util/mixin/AnnotationProcessorInvoker.java
@@ -76,7 +76,7 @@ public abstract class AnnotationProcessorInvoker<T extends Task> {
 					put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, inMapFile.getCanonicalPath());
 					put(Constants.MixinArguments.OUT_MAP_FILE_NAMED_INTERMEDIARY, extension.getNextMixinMappings().getCanonicalPath());
 					put(Constants.MixinArguments.OUT_REFMAP_FILE, getRefmapDestination(task, extension));
-					put(Constants.MixinArguments.DEFAULT_OBFUSCATION_ENV, extension.isForge() ? "searge" : "named:intermediary");
+					put(Constants.MixinArguments.DEFAULT_OBFUSCATION_ENV, "named:intermediary");
 				}};
 
 			project.getLogger().debug("Outputting refmap to dir: " + getDestinationDir(task) + " for compile task: " + task);