diff --git a/release/release.gradle b/release/release.gradle
index 6d58ce21a6..bbf5d9c744 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -190,6 +190,10 @@ distributions {
                 from parent.project( 'hibernate-entitymanager' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
             }
 
+            into( 'lib/jpa-metamodel-generator' ) {
+                from parent.project( 'metamodel-generator' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
+            }
+
             into( 'lib/envers' ) {
                 from(
                         ( parent.project( 'hibernate-envers' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
diff --git a/tooling/metamodel-generator/metamodel-generator.gradle b/tooling/metamodel-generator/metamodel-generator.gradle
index 88b4e24e6b..59b09f8a77 100644
--- a/tooling/metamodel-generator/metamodel-generator.gradle
+++ b/tooling/metamodel-generator/metamodel-generator.gradle
@@ -1,7 +1,4 @@
-
 apply plugin: 'version-injection'
-apply plugin: 'distribution'
-
 
 dependencies {
 	testCompile libraries.junit
@@ -72,104 +69,6 @@ compileJava.dependsOn jaxb
 
 checkstyleMain.exclude '**/jaxb/**'
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Javadocs
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-final File javadocDir = mkdir( new File( project.buildDir, 'javadocs/api' ) );
-final int copyrightYear = new GregorianCalendar().get( Calendar.YEAR );
-task javadocs(type: Javadoc) {
-    source = sourceSets.main.allJava
-    destinationDir = javadocDir
-    excludes = ['org/hibernate/jpamodelgen/xml/jaxb/**']
-    // need to update the javadic classpath and add the main compilation directory to avoid missing classes warnigns due to the
-    // above excludes
-    classpath = files( configurations.compile, "${buildDir}/classes/main" )
-    maxMemory = '512m'
-    configure( options ) {
-        stylesheetFile = rootProject.file( 'src/config/javadoc/stylesheet.css' )
-        windowTitle = 'Hibernate JPA 2 Metamodel Generator JavaDocs'
-        docTitle = "Hibernate JPA 2 Metamodel Generator JavaDocs ($project.version)"
-        bottom = "Copyright &copy; 2001-$copyrightYear <a href=\"http://redhat.com\">Red Hat, Inc.</a>  All Rights Reserved."
-        use = true
-        links = [ 'http://download.oracle.com/javase/6/docs/api/', 'http://download.oracle.com/javaee/6/api/' ]
-    }
-
-    doLast {
-        copy {
-            from rootProject.file( 'src/config/javadoc/images' )
-            into new File( javadocDir, "/images" )
-        }
-    }
-}
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Release
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-distributions {
-    main {
-        baseName = 'hibernate-jpamodelgen-dist'
-        contents {
-            from rootProject.file( 'README.md' )
-            from rootProject.file( 'license.txt' )
-            from rootProject.file( 'changelog.txt' )
-            
-            into('lib') {
-                from ( "${buildDir}/libs" ) {
-                  exclude( '*-sources.jar' )  
-                }
-            }
-
-            // javadocs
-            into('docs/api') {
-                from javadocDir
-            }
-
-            //  docbook
-            into('docs/reference') {
-                from "${buildDir}/docbook/publish/manual/en-US"
-            }
-
-            into( 'project' ) {
-                from ( rootProject.projectDir ) {
-                    exclude( '.git' )
-                    exclude( '.gitignore' )
-                    exclude( 'README.md')
-                    exclude( 'changelog.txt' )
-                    exclude( 'license.txt' )
-                    exclude( 'gradle' )
-                    exclude( 'gradlew' )
-                    exclude( 'gradlew.bat' )
-                    exclude( 'wrapper/*' )
-                    exclude( '**/.gradle/**' )
-                    exclude( '**/target/**' )
-                    exclude( '.idea' )
-                    exclude( '**/*.ipr' )
-                    exclude( '**/*.iml' )
-                    exclude( '**/*.iws' )
-                    exclude( '**/atlassian-ide-plugin.xml' )
-                    exclude( '**/.classpath' )
-                    exclude( '**/.project' )
-                    exclude( '**/.settings' )
-                }
-            }
-        }
-    }
-}
-
-distZip.dependsOn build,javadocs //,buildDocs
-distTar.dependsOn build,javadocs //,buildDocs
-distTar {
-    compression = Compression.GZIP
-}
-
-task buildBundles(type: Task, dependsOn: [distZip,distTar]) {
-    description = "Builds all release bundles"
-}
-
-task release(dependsOn: [publish,buildBundles]) {
-    description = "Execute all release tasks"
-}
-