diff --git a/main/core/pom.xml b/main/core/pom.xml
index d23e756e7..e83bd5a7e 100644
--- a/main/core/pom.xml
+++ b/main/core/pom.xml
@@ -30,12 +30,6 @@
 			<artifactId>crypto-api</artifactId>
 		</dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-
 		<!-- Jetty (Servlet Container) -->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
diff --git a/main/core/src/main/resources/log4j.xml b/main/core/src/main/resources/log4j.xml
deleted file mode 100644
index 9583a53e2..000000000
--- a/main/core/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (c) 2014 Sebastian Stenzel
-  This file is licensed under the terms of the MIT license.
-  See the LICENSE.txt file for more info.
-  
-  Contributors:
-      Sebastian Stenzel - initial API and implementation
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out"/> 
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-		<filter class="org.apache.log4j.varia.LevelRangeFilter">
-            <param name="LevelMin" value="debug" />
-            <param name="LevelMax" value="info" />
-        </filter>
-	</appender>
-	
-	<appender name="stderr" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.err"/>
-		<param name="threshold" value="warn" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-	</appender>
-
-	<appender name="fileAppender" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="/tmp/webdav.log" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="DEBUG" />
-		<appender-ref ref="console" />
-		<appender-ref ref="stderr" />
-	</root>
-	
-	
-</log4j:configuration>
diff --git a/main/core/src/main/resources/log4j2.xml b/main/core/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..249d75093
--- /dev/null
+++ b/main/core/src/main/resources/log4j2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright (c) 2014 Markus Kreusch
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Markus Kreusch - switched to log4j 2
+-->
+<Configuration status="WARN">
+
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+		</Console>
+		<Console name="StdErr" target="SYSTEM_ERR">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+		</Console>
+	</Appenders>
+	
+	<Loggers>
+		<Root level="DEBUG">
+			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdErr" />
+		</Root>
+	</Loggers>
+	
+</Configuration>
diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml
index c05dee070..777ccc5c2 100644
--- a/main/crypto-aes/pom.xml
+++ b/main/crypto-aes/pom.xml
@@ -24,12 +24,6 @@
 			<artifactId>crypto-api</artifactId>
 		</dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-
 		<!-- Commons -->
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -48,18 +42,11 @@
 			<artifactId>commons-codec</artifactId>
 		</dependency>
 
-
 		<!-- JSON -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-
-		<!-- JUnit -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 	</dependencies>
 	
 	<build>
diff --git a/main/pom.xml b/main/pom.xml
index 3c66b30fb..2202b4e12 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2014 Sebastian Stenzel
-  This file is licensed under the terms of the MIT license.
-  See the LICENSE.txt file for more info.
-  
-  Contributors:
-      Sebastian Stenzel - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the 
+	terms of the MIT license. See the LICENSE.txt file for more info. Contributors: 
+	Sebastian Stenzel - initial API and implementation -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
 	<version>0.1.0</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
-	
+
 	<organization>
 		<name>cryptomator.org</name>
 		<url>http://cryptomator.org</url>
 	</organization>
-	
+
 	<developers>
 		<developer>
 			<name>Sebastian Stenzel</name>
@@ -32,8 +28,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<log4j.version>1.2.16</log4j.version>
-		<slf4j.version>1.7.5</slf4j.version>
+		<log4j.version>2.1</log4j.version>
 		<junit.version>4.11</junit.version>
 		<commons-io.version>2.4</commons-io.version>
 		<commons-collections.version>4.0</commons-collections.version>
@@ -64,22 +59,22 @@
 				<artifactId>ui</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-		
+
 			<!-- Logging -->
 			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
 				<version>${log4j.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j.version}</version>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>${log4j.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>${slf4j.version}</version>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jul</artifactId>
+				<version>${log4j.version}</version>
 			</dependency>
 
 			<!-- commons -->
@@ -121,6 +116,25 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jul</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+	</dependencies>
+
 	<modules>
 		<module>crypto-api</module>
 		<module>crypto-aes</module>