diff --git a/pom.xml b/pom.xml
index 530c36f..e2fffcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,9 +88,9 @@
 			<version>1.3.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.mchange</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>0.9.5.1</version>
+			<groupId>com.zaxxer</groupId>
+			<artifactId>HikariCP</artifactId>
+			<version>3.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index 6b8bd51..92c2da4 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -23,11 +23,11 @@
     <!--
     <Manager pathname="" />
     -->
-    <Resource auth="Container" description="C3P0 database connection pool"
+    <Resource auth="Container" description="HikariCP database connection pool"
         driverClass="com.mysql.jdbc.Driver" maxPoolSize="10" minPoolSize="2" acquireIncrement="1"
         maxIdleTime="3600" idleConnectionTestPeriod="1800" name="jdbc/netsupport" user="root"
         password="" factory="org.apache.naming.factory.BeanFactory"
-        type="com.mchange.v2.c3p0.ComboPooledDataSource"
+        type="com.zaxxer.hikari.HikariDataSource"
         jdbcUrl="jdbc:mysql://localhost:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
     <!-- Uncomment this to enable Comet connection tacking (provides events
          on session expiration as well as webapp lifecycle) -->