diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java b/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
index b8cd05490d..877c210751 100644
--- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
+++ b/fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
@@ -62,14 +62,14 @@ public class FMLLaunchHandler
 
     private void setupClient()
     {
-        FMLRelaunchLog.logFileNamePattern = "ForgeModLoader-client-%g.log";
+        FMLRelaunchLog.side = Side.CLIENT;
         side = Side.CLIENT;
         setupHome();
     }
 
     private void setupServer()
     {
-        FMLRelaunchLog.logFileNamePattern = "ForgeModLoader-server-%g.log";
+        FMLRelaunchLog.side = Side.SERVER;
         side = Side.SERVER;
         setupHome();
 
diff --git a/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
index e3f4a848d6..2c6084d297 100644
--- a/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
+++ b/fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
@@ -13,9 +13,11 @@
 package cpw.mods.fml.relauncher;
 
 import java.io.File;
+import java.util.Locale;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 
 public class FMLRelaunchLog {
 
@@ -30,7 +32,7 @@ public class FMLRelaunchLog {
 
     private Logger myLog;
 
-    static String logFileNamePattern;
+    static Side side;
 
     private FMLRelaunchLog()
     {
@@ -42,6 +44,7 @@ public class FMLRelaunchLog {
     private static void configureLogging()
     {
         log.myLog = LogManager.getLogger("FML");
+        ThreadContext.put("side", side.name().toLowerCase(Locale.ENGLISH));
         configured = true;
     }
 
diff --git a/fml/src/main/resources/log4j2.xml b/fml/src/main/resources/log4j2.xml
index 49d1c53676..18eab39a0f 100644
--- a/fml/src/main/resources/log4j2.xml
+++ b/fml/src/main/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="com.mojang.util" verbose="true">
+<Configuration status="debug" packages="com.mojang.util">
     <Appenders>
         <Console name="FmlSysOut" target="SYSTEM_OUT">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
@@ -17,33 +17,43 @@
                 <OnStartupTriggeringPolicy />
             </Policies>
         </RollingRandomAccessFile>
-        <RollingRandomAccessFile name="FmlFile" fileName="logs/fml-latest.log" filePattern="logs/fml-%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
-            <DefaultRolloverStrategy max="3" />
-            <Policies>
-                <TimeBasedTriggeringPolicy />
-                <OnStartupTriggeringPolicy />
-            </Policies>
-        </RollingRandomAccessFile>
+        <Routing name="FmlFile">
+            <Routes pattern="$${ctx:side}">
+                <Route>
+                    <RollingRandomAccessFile name="FmlFile" fileName="logs/fml-${ctx:side}-latest.log" filePattern="logs/fml-${ctx:side}-%i.log">
+                        <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
+                        <DefaultRolloverStrategy max="3" fileIndex="max" />
+                        <Policies>
+                            <OnStartupTriggeringPolicy />
+                        </Policies>
+                    </RollingRandomAccessFile>
+                </Route>
+                <Route key="$${ctx:side}">
+                    <RandomAccessFile name="FmlFile" fileName="logs/fml-junk-earlystartup.log" >
+                        <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
+                    </RandomAccessFile>
+                </Route>
+            </Routes>
+        </Routing>
     </Appenders>
     <Loggers>
         <Logger level="info" name="com.mojang" additivity="false">
-            <AppenderRef ref="SysOut" level="INFO"/>
+            <AppenderRef ref="SysOut" level="INFO" />
             <AppenderRef ref="File" />
-            <AppenderRef ref="ServerGuiConsole" level="INFO"/>
+            <AppenderRef ref="ServerGuiConsole" level="INFO" />
         </Logger>
         <Logger level="info" name="net.minecraft" additivity="false">
             <filters>
                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
             </filters>
-            <AppenderRef ref="SysOut" level="INFO"/>
+            <AppenderRef ref="SysOut" level="INFO" />
             <AppenderRef ref="File" />
-            <AppenderRef ref="ServerGuiConsole" level="INFO"/>
+            <AppenderRef ref="ServerGuiConsole" level="INFO" />
         </Logger>
         <Root level="all">
-            <AppenderRef ref="FmlSysOut" level="INFO"/>
-            <AppenderRef ref="ServerGuiConsole" level="INFO"/>
-            <AppenderRef ref="FmlFile" />
+            <AppenderRef ref="FmlSysOut" level="INFO" />
+            <AppenderRef ref="ServerGuiConsole" level="INFO" />
+            <AppenderRef ref="FmlFile"/>
         </Root>
     </Loggers>
 </Configuration>