diff --git a/pom.xml b/pom.xml
index a84ab01af..28c14360b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<date>${maven.build.timestamp}</date>
 		<roo.version>1.3.2.RELEASE</roo.version>
 		<slf4j.version>1.7.5</slf4j.version>
+		<log4j.version>2.16.0</log4j.version>
 		<spring.version>3.2.11.RELEASE</spring.version>
 		<querydsl.version>3.4.3</querydsl.version>
 		<spring-security.version>3.2.5.RELEASE</spring-security.version>
@@ -163,12 +164,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		  </dependency>
 		  <dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.15.0</version>
+			<version>${log4j.version}</version>
 		  </dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -181,9 +182,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
@@ -580,6 +581,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
     		<groupId>org.openscience.cdk</groupId>
     		<artifactId>cdk-inchi</artifactId>
     		<version>${cdk.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100755
index fba47ac72..000000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#Updated at Wed Mar 12 18:09:19 PDT 2014
-#Wed Mar 12 18:09:19 PDT 2014
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.R.File=../logs/catalina.out
-#../logs/acas_application.log
-log4j.rootLogger=INFO, R, stdout
-log4j.appender.R.MaxFileSize=2MB
-log4j.logger.org.springframework=INFO
-log4j.logger.com.labsynch.labseer=INFO
-log4j.logger.com.mangofactory.swagger=ERROR
-log4j.logger.org.springframework.security=INFO
-log4j.appender.R.MaxBackupIndex=10
-log4j.logger.org.springframework.web=INFO
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %-4r [%t] %-5p %c %x - %m%n
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %-4r [%t] %-5p %c %x - %m%n
-log4j.logger.org.springframework.orm=INFO
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.R=org.apache.log4j.RollingFileAppender
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100755
index 000000000..e5da99971
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+  <Appenders>
+    <Console name="STDOUT" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{dd MMM yyyy HH:mm:ss} %-4r [%t] %-5p %c %x - %m%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Logger name="com.labsynch.labseer" level="info"/>
+    <Logger name="com.mangofactory.swagger" level="error"/>
+    <Logger name="org.springframework" level="info"/>
+    <Logger name="org.springframework.orm" level="info"/>
+    <Logger name="org.springframework.security" level="info"/>
+    <Logger name="org.springframework.web" level="info"/>
+    <Root level="info">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+  </Loggers>
+</Configuration>
\ No newline at end of file