diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
index 430aee8d1c..f6184f143e 100644
--- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -121,10 +121,8 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     private DummyModContainer optifineContainer;
 
-    @SuppressWarnings("unused")
     private boolean guiLoaded;
 
-    @SuppressWarnings("unused")
     private boolean serverIsRunning;
 
     private MissingModsException modsMissing;
@@ -143,7 +141,6 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     private List<IResourcePack> resourcePackList;
 
-    @SuppressWarnings("unused")
     private IReloadableResourceManager resourceManager;
 
     private Map<String, IResourcePack> resourcePackMap;
@@ -298,7 +295,6 @@ public class FMLClientHandler implements IFMLSidedHandler
         loading = false;
     }
 
-    @SuppressWarnings("unused")
     public void extendModList()
     {
         @SuppressWarnings("unchecked")
@@ -359,15 +355,6 @@ public class FMLClientHandler implements IFMLSidedHandler
         return client;
     }
 
-    /**
-     * Get a handle to the client's logger instance
-     * The client actually doesn't have one- so we return null
-     */
-    public Logger getMinecraftLogger()
-    {
-        return null;
-    }
-
     /**
      * @return the instance
      */
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000000..5bb9b92ddd
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="net.minecraft,com.mojang">
+    <Appenders>
+        <Console name="FmlSysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
+        </Console>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+        </Queue>
+        <Queue name="FmlServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level] [%logger]: %msg%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <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" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+                <DefaultRolloverStrategy max="3"/>
+            </Policies>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info" name="net/minecraft" additibity="false">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="ServerGuiConsole"/>
+        </Root>
+        <Root level="all">
+            <AppenderRef ref="FmlSysOut"/>
+            <AppenderRef ref="FmlFile"/>
+            <AppenderRef ref="FmlServerGuiConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>