diff --git a/hapi-fhir-jpaserver-base/.classpath b/hapi-fhir-jpaserver-base/.classpath
index 5bd66fbcc59..36f00e3c87a 100644
--- a/hapi-fhir-jpaserver-base/.classpath
+++ b/hapi-fhir-jpaserver-base/.classpath
@@ -20,6 +20,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sql"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component
index 2b85b7b09b0..0f14ec73f00 100644
--- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component
+++ b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component
@@ -6,5 +6,6 @@
         <wb-resource deploy-path="/" source-path="/target/generated-sources/tinder"/>
         <wb-resource deploy-path="/" source-path="/src/test/java"/>
         <wb-resource deploy-path="/" source-path="/src/test/resources"/>
+        <wb-resource deploy-path="/" source-path="/target/generated-sql"/>
     </wb-module>
 </project-modules>
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index d06d09142dd..2047114261e 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -340,6 +340,56 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>de.juplo</groupId>
+				<artifactId>hibernate-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>postgres94</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<dialect>org.hibernate.dialect.PostgreSQL94Dialect</dialect>
+							<outputFile>${project.build.directory}/generated-sql/ca/uhn/hapi/fhir/jpa/docs/database/persistence_create_postgres94.sql</outputFile>	
+						</configuration>
+					</execution>
+					<execution>
+						<id>mysql57</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<dialect>org.hibernate.dialect.MySQL57InnoDBDialect</dialect>
+							<outputFile>${project.build.directory}/generated-sql/ca/uhn/hapi/fhir/jpa/docs/database/persistence_create_mysql57.sql</outputFile>	
+						</configuration>
+					</execution>
+					<execution>
+						<id>oracle12c</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<dialect>org.hibernate.dialect.Oracle12cDialect</dialect>
+							<outputFile>${project.build.directory}/generated-sql/ca/uhn/hapi/fhir/jpa/docs/database/persistence_create_oracle12c.sql</outputFile>	
+						</configuration>
+					</execution>
+					<execution>
+						<id>sqlserver2012</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<dialect>org.hibernate.dialect.SQLServer2012Dialect</dialect>
+							<outputFile>${project.build.directory}/generated-sql/ca/uhn/hapi/fhir/jpa/docs/database/persistence_create_sqlserver2012.sql</outputFile>	
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -456,6 +506,10 @@
 			<resource>
 				<directory>${basedir}/target/generated-resources/tinder</directory>
 			</resource>
+			<resource>
+				<directory>${project.build.directory}/generated-sql</directory>
+				<filtering>false</filtering> 
+			</resource>
 		</resources>
 	</build>
 
diff --git a/pom.xml b/pom.xml
index d7805e3cd31..4edaa5a4675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -757,8 +757,16 @@
 			<plugins>
 				<plugin>
 					<groupId>de.juplo</groupId>
-					<artifactId>hibernate4-maven-plugin</artifactId>
-					<version>1.1.0</version>
+					<artifactId>hibernate-maven-plugin</artifactId>
+					<version>2.0.0</version>
+					<configuration>
+						<export>false</export>
+						<skip>false</skip>
+						<scanDependencies>false</scanDependencies>
+						<scanTestClasses>false</scanTestClasses>
+						<scanClasses>true</scanClasses>
+						<force>true</force>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>