diff --git a/org.eclipse.gemini.dbaccess.util/META-INF/MANIFEST.MF b/org.eclipse.gemini.dbaccess.util/META-INF/MANIFEST.MF
index 934e98d..2e1aeed 100644
--- a/org.eclipse.gemini.dbaccess.util/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.dbaccess.util/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.gemini.dbaccess;version="1.1.0"
-Import-Package: org.osgi.service.jdbc;version="1.0.0"
-
+Import-Package: javax.sql,
+ org.osgi.service.jdbc;version="1.0.0"
diff --git a/org.eclipse.gemini.dbaccess.util/src/org/eclipse/gemini/dbaccess/UrlBasedDriverDataSource.java b/org.eclipse.gemini.dbaccess.util/src/org/eclipse/gemini/dbaccess/UrlBasedDriverDataSource.java
index ce19485..7bf01a6 100644
--- a/org.eclipse.gemini.dbaccess.util/src/org/eclipse/gemini/dbaccess/UrlBasedDriverDataSource.java
+++ b/org.eclipse.gemini.dbaccess.util/src/org/eclipse/gemini/dbaccess/UrlBasedDriverDataSource.java
@@ -24,13 +24,15 @@
 import java.sql.Driver;
 import java.sql.SQLFeatureNotSupportedException;
 
+import javax.sql.DataSource;
+
 import static org.osgi.service.jdbc.DataSourceFactory.*;
 
 /** 
  * An abbreviated/simplified DataSource impl that takes a URL from the client
  * and just returns a thin data source wrapper around the basic JDBC driver.
  */
-class UrlBasedDriverDataSource implements javax.sql.DataSource {
+class UrlBasedDriverDataSource implements DataSource {
 
     Driver driver;
     Properties properties = null;