diff -up --recursive mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java
--- mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java	2015-06-19 21:26:19.000000000 +0200
+++ mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java	2015-07-14 17:07:23.750395725 +0200
@@ -27,7 +27,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 
 import com.mysql.fabric.FabricCommunicationException;
 import com.mysql.fabric.FabricConnection;
diff -up --recursive mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java
--- mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java	2015-06-19 21:26:20.000000000 +0200
+++ mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java	2015-07-14 17:14:19.676360531 +0200
@@ -30,7 +30,7 @@ import java.sql.Statement;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import com.mysql.fabric.hibernate.FabricMultiTenantConnectionProvider;
 
@@ -107,13 +107,13 @@ public class HibernateFabric {
         // creating this here allows passing needed params to the constructor
         FabricMultiTenantConnectionProvider connProvider = new FabricMultiTenantConnectionProvider(fabricUrl, "employees", "employees", username, password,
                 fabricUser, fabricPassword);
-        ServiceRegistryBuilder srb = new ServiceRegistryBuilder();
-        srb.addService(org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider);
+        StandardServiceRegistryBuilder srb = new StandardServiceRegistryBuilder();
+        srb.addService(org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider);
         srb.applySetting("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect");
 
         Configuration config = new Configuration();
         config.setProperty("hibernate.multiTenancy", "DATABASE");
         config.addResource("com/mysql/fabric/demo/employee.hbm.xml");
-        return config.buildSessionFactory(srb.buildServiceRegistry());
+        return config.buildSessionFactory(srb.build());
     }
 }