diff --git a/Server/src/main/java/net/simon987/server/Main.java b/Server/src/main/java/net/simon987/server/Main.java
index 2b93634..cab15d0 100644
--- a/Server/src/main/java/net/simon987/server/Main.java
+++ b/Server/src/main/java/net/simon987/server/Main.java
@@ -9,9 +9,9 @@ import java.net.InetSocketAddress;
 public class Main {
     public static void main(String[] args) {
 
-
-        LogManager.initialize();
         ServerConfiguration config = new ServerConfiguration("config.properties");
+        LogManager.initialize(config);
+
         //Load
         GameServer.INSTANCE.load();
 
diff --git a/Server/src/main/java/net/simon987/server/logging/LogManager.java b/Server/src/main/java/net/simon987/server/logging/LogManager.java
index 47b11e3..33cc974 100755
--- a/Server/src/main/java/net/simon987/server/logging/LogManager.java
+++ b/Server/src/main/java/net/simon987/server/logging/LogManager.java
@@ -1,5 +1,7 @@
 package net.simon987.server.logging;
 
+import net.simon987.server.ServerConfiguration;
+
 import java.io.IOException;
 import java.util.logging.*;
 
@@ -16,7 +18,7 @@ public class LogManager {
     /**
      * Initialises the logger
      */
-    public static void initialize() {
+    public static void initialize(ServerConfiguration config) {
         LOGGER.setUseParentHandlers(false);
 
         /*
@@ -45,15 +47,18 @@ public class LogManager {
         handler.setLevel(Level.ALL);
 
         try {
-            Handler fileHandler = new FileHandler("mar.log");
+            Handler fileHandler = new FileHandler("mar-%g.log", config.getInt("log_limit"),
+                    config.getInt("log_count"));
             fileHandler.setLevel(Level.ALL);
             fileHandler.setFormatter(new GenericFormatter());
 
+
             LOGGER.addHandler(handler);
             LOGGER.addHandler(errHandler);
             LOGGER.addHandler(fileHandler);
             LOGGER.setLevel(Level.ALL);
 
+
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/Server/src/main/resources/config.properties b/Server/src/main/resources/config.properties
index 1c925dc..05bdd6f 100644
--- a/Server/src/main/resources/config.properties
+++ b/Server/src/main/resources/config.properties
@@ -6,8 +6,8 @@ mysql_pass=mar
 mysql_url=jdbc:mysql://localhost:3306/mar?useSSL=false
 # File management
 save_interval=5
-clean_interval=10
-history_size=10
+log_limit=2000000
+log_count=10
 # Web server port
 webSocket_port=8887
 webSocket_host=0.0.0.0