diff --git a/tooling/metamodel-generator/build.gradle b/tooling/metamodel-generator/build.gradle
index c0084473f8..5138929c4d 100644
--- a/tooling/metamodel-generator/build.gradle
+++ b/tooling/metamodel-generator/build.gradle
@@ -6,6 +6,8 @@ apply plugin: 'maven-publish-auth'
 apply plugin: 'jdocbook'
 apply plugin: 'checkstyle'
 apply plugin: 'distribution'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '1.7'
@@ -327,7 +329,9 @@ distributions {
             from rootProject.file( 'changelog.txt' )
             
             into('lib') {
-                configurations.archives.allArtifacts
+                from ( "${buildDir}/libs" ) {
+                  exclude( '*-sources.jar' )  
+                }
             }
 
             // javadocs
diff --git a/tooling/metamodel-generator/src/main/assembly/dist.xml b/tooling/metamodel-generator/src/main/assembly/dist.xml
deleted file mode 100644
index 62b1125ca2..0000000000
--- a/tooling/metamodel-generator/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<assembly>
-    <id>dist</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib</outputDirectory>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory/>
-            <includes>
-                <include>hibernate-jpamodelgen-*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>hibernate-jpamodelgen-*-sources.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>docs/api</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target/docbook/publish</directory>
-            <outputDirectory>docs/reference</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>.</directory>
-            <outputDirectory/>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <includes>
-                <include>pom.xml</include>
-                <include>license.txt</include>
-                <include>README.md</include>
-                <include>changelog.txt</include>
-                <include>src/**</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/tooling/metamodel-generator/src/test/suite/unit-tests.xml b/tooling/metamodel-generator/src/test/suite/unit-tests.xml
deleted file mode 100644
index 7483b6d79f..0000000000
--- a/tooling/metamodel-generator/src/test/suite/unit-tests.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Hibernate Model Generator Tests" verbose="1">
-    <test name="Unit tests">
-        <packages>
-            <package name="org.hibernate.jpamodelgen.test.*"/>
-        </packages>
-        <classes>
-            <class name="DefaultPackageTest"/>
-        </classes>
-    </test>
-</suite>
\ No newline at end of file