diff --git a/pom.xml b/pom.xml
index 97f39f0..0d7dc03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,14 @@
 			<version>20180130</version>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.11.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.11.1</version>
 		</dependency>
 	</dependencies>
 	<properties>
diff --git a/src/de/mrbesen/telegram/TelegramAPI.java b/src/de/mrbesen/telegram/TelegramAPI.java
index 2df2948..0ee62d0 100644
--- a/src/de/mrbesen/telegram/TelegramAPI.java
+++ b/src/de/mrbesen/telegram/TelegramAPI.java
@@ -42,7 +42,8 @@ public class TelegramAPI implements Runnable {
 	private LinkedList<TUser> users = new LinkedList<>();
 	private CommandManager cmdmgr = new CommandManager();
 	private EventManager evntmgr = new EventManager();
-	Log log = new SimpleLog();
+	//Log log = new SimpleLog();
+	Log log = new Log4JLog();
 
 	public TelegramAPI(String apikey) {
 		if (!apikey.matches(TOKENREGEX) ) {
@@ -70,7 +71,7 @@ public class TelegramAPI implements Runnable {
 		OutputStreamWriter wr = new OutputStreamWriter(con.getOutputStream());
 		wr.write(parameter);
 		wr.flush(); 
-		log.log( this.getClass().getSimpleName() + ": request: " + request + " content " + parameter + " -> " + con.getResponseCode() + ", " + con.getResponseMessage());
+		log.log( "request: " + request + " content " + parameter + " -> " + con.getResponseCode() + ", " + con.getResponseMessage());
 		if(con.getResponseCode() == 200) {
 			Scanner s = new Scanner(con.getInputStream());
 			StringBuilder sb_apianswer = new StringBuilder();
diff --git a/src/de/mrbesen/telegram/log/Log4JLog.java b/src/de/mrbesen/telegram/log/Log4JLog.java
index 6c31d2b..a94bb7d 100644
--- a/src/de/mrbesen/telegram/log/Log4JLog.java
+++ b/src/de/mrbesen/telegram/log/Log4JLog.java
@@ -1,13 +1,14 @@
 package de.mrbesen.telegram.log;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Log4JLog extends Log {
 
 	Logger log;
 	
 	public Log4JLog() {
-		log = Logger.getRootLogger();
+		log = LogManager.getLogger("TelegramAPI");
 	}
 
 	public Log4JLog(Logger l) {
diff --git a/src/de/mrbesen/test/Main.java b/src/de/mrbesen/test/Main.java
index ec4be93..5e29f34 100644
--- a/src/de/mrbesen/test/Main.java
+++ b/src/de/mrbesen/test/Main.java
@@ -24,8 +24,7 @@ public class Main implements Runnable, EventListener {
 	}
 
 	public Main() {
-		String token = "692523284:AAEO1xY3GxsIOc5Tb6cI7Ild4IGTStLBiwk";
-		String tokenmain = "577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw";
+		String token = "577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw";
 		api = new TelegramAPI(token);
 		api.getCommandManager().registerCommand("test", new SimpleTestCase());
 		api.getCommandManager().registerCommand("inlinekb", new InlineKeyboardTC());
diff --git a/src/log4j2.properties b/src/log4j2.properties
new file mode 100644
index 0000000..1411b79
--- /dev/null
+++ b/src/log4j2.properties
@@ -0,0 +1,18 @@
+status = error
+name = PropertiesConfig
+ 
+filters = threshold
+ 
+filter.threshold.type = ThresholdFilter
+filter.threshold.level = debug
+ 
+appenders = console
+ 
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+ 
+rootLogger.level = debug
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = STDOUT
\ No newline at end of file