diff --git a/readme.txt b/readme.txt
index aa40cb9b..7350bf6b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -160,7 +160,7 @@ you might run into the following issues:
 * You will see some spurious JSF warnings on some pages due to a GlassFish 
   4/Mojarra bug (https://java.net/jira/browse/GLASSFISH-20244). The error is 
   harmless and can be ignored.
-* Sometimes when GlassFish is not shutdown correctly, the Derby database that 
+* Sometimes when GlassFish is not shutdown correctly, the H2 database that 
   the application uses get's corrupted, resulting is strange JDBC errors. If 
   this occurs, you will need to stop the application and clean the database. You 
   can do this by simply removing \temp\cargo-tracker-database from the file 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ec0bf532..3c5bb7bd 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -50,8 +50,8 @@
          faster. -->
     <data-source>
         <name>java:app/jdbc/CargoTrackerDatabase</name>
-        <class-name>org.apache.derby.jdbc.EmbeddedDriver</class-name>
-        <url>jdbc:derby:/tmp/cargo-tracker-database;create=true</url>
+        <class-name>org.h2.Driver</class-name>
+        <url>jdbc:h2:./tmp/cargo-tracker-database;AUTO_SERVER=TRUE</url>
     </data-source>
     <jms-destination>
         <name>java:app/jms/CargoHandledQueue</name>