diff --git a/li.strolch.persistence.postgresql/pom.xml b/li.strolch.persistence.postgresql/pom.xml
index 429c90c03..d00eed9b9 100644
--- a/li.strolch.persistence.postgresql/pom.xml
+++ b/li.strolch.persistence.postgresql/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<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">
+<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">
 
 	<parent>
 		<groupId>li.strolch</groupId>
@@ -50,7 +49,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.3-1100-jdbc41</version>
+			<version>9.4.1208.jre7</version>
 		</dependency>
 
 		<!-- test -->
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
index fcc3c6002..d06daab56 100644
--- a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
+++ b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
@@ -22,7 +22,6 @@ import static ch.eitchnet.db.DbConstants.PROP_ALLOW_SCHEMA_MIGRATION;
 import static li.strolch.agent.api.RealmHandler.SYSTEM_USER_DB_INITIALIZER;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.text.MessageFormat;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -60,8 +59,6 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
 	public static final String SCRIPT_PREFIX = "strolch"; //$NON-NLS-1$
 	private Map<String, DataSource> dsMap;
 
-	private Driver driver;
-
 	public PostgreSqlPersistenceHandler(ComponentContainer container, String componentName) {
 		super(container, componentName);
 	}
@@ -69,8 +66,7 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
 	@Override
 	public void initialize(ComponentConfiguration componentConfiguration) throws Exception {
 
-		this.driver = new Driver();
-		DriverManager.registerDriver(this.driver);
+		Driver.register();
 
 		DbConnectionBuilder connectionBuilder = new PostgreSqlDbConnectionBuilder(getContainer(),
 				componentConfiguration);
@@ -128,8 +124,8 @@ public class PostgreSqlPersistenceHandler extends StrolchComponent implements Pe
 			}
 		}
 
-		if (this.driver != null)
-			DriverManager.deregisterDriver(this.driver);
+		if (Driver.isRegistered())
+			Driver.deregister();
 
 		super.destroy();
 	}