diff --git a/build.gradle b/build.gradle
index 40f1eb3968..79c91e7ff2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,13 @@ ideaProject {
         def vcsConfig = node.component.find { it.'@name' == 'VcsDirectoryMappings' }
         vcsConfig.mapping[0].'@vcs' = 'Git'
     }
+    beforeConfigured { module ->
+        module.modulePaths.removeAll { it.filePath.endsWith('hibernate-core.iml') }
+    }
 }
 
 ideaModule {
+    moduleName = 'hibernate-core-root'
 }
 
 // build a map of the dependency artifacts to use.  Allows centralized definition of the version of artifacts to
@@ -138,7 +142,7 @@ subprojects { subProject ->
             deployerJars "org.apache.maven.wagon:wagon-http:1.0-beta-6"
         }
 
-        aptDumpDir = file( buildDirName + "/temp/apt" )
+        aptDumpDir = file( buildDirName + "/tmp/apt" )
 
         sourceSets.main {
             compileClasspath += configurations.provided
@@ -211,9 +215,17 @@ subprojects { subProject ->
             whenConfigured { module ->
                 module.dependencies*.exported = true
             }
-//	        testSourceDirs.add( file( generatedSrcDirName ) )
-//	        testSourceDirs.add( file( generatedTestSrcDirName ) )
+            excludeDirs = [
+                    file(".gradle"),
+                    file("$buildDir/classes"),
+                    file("$buildDir/dependency-cache"),
+                    file("$buildDir/libs"),
+                    file("$buildDir/reports"),
+                    file("$buildDir/test-results"),
+                    file("$buildDir/tmp")
+            ] as Set
         }
+
 		eclipseClasspath {
 			plusConfigurations.add( configurations.provided )
 		}
@@ -280,10 +292,11 @@ dependsOnChildren()
 
 // This is a task that generates the gradlew scripts, allowing users to run gradle without having gradle installed
 // on their system.
-// This task should be run by "build master" and the resulting ouput committed to source control.  Its outputs include:
+// This task should be run by "build master" and the resulting output committed to source control.  Its outputs include:
 //  1) /gradlew which is the *NIX shell script for executing builds
 //  2) /gradlew.bat which is the windows bat script for for executing builds
 //  3) /wrapper which is a directory named by the "jarPath" config which contains other needed files.
 task wrapper(type: Wrapper) {
-    gradleVersion = '0.9.2'
+    // HHH-6106 - this is needed for IntellJ generation until 1.0-milestone-3 is released.
+    gradleVersion = '1.0-milestone-3-20110411214339+0200'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9d7bbe005f..03234b176c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1dfbbea00e..b3106c59e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 10 09:53:56 CST 2011
+#Wed Apr 13 22:28:41 CDT 2011
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.2-bin.zip
+distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-snapshots/gradle-1.0-milestone-3-20110411214339+0200-bin.zip
diff --git a/hibernate-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle
index cad959dafb..f0934e7e47 100644
--- a/hibernate-ehcache/hibernate-ehcache.gradle
+++ b/hibernate-ehcache/hibernate-ehcache.gradle
@@ -1,4 +1,4 @@
-        apply plugin: 'java'
+apply plugin: 'java'
 
 dependencies {
     compile( project( ':hibernate-core' ) )
diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle
index b6a8946f37..43d1f5ce35 100644
--- a/hibernate-entitymanager/hibernate-entitymanager.gradle
+++ b/hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -19,7 +19,7 @@ dependencies {
     testRuntime( libraries.validator )
 }
 
-aptDumpDir = file( buildDirName + "/temp/apt" )
+aptDumpDir = file( buildDirName + "/tmp/apt" )
 
 sourceSets.test {
     originalJavaSrcDirs = java.srcDirs
@@ -27,6 +27,10 @@ sourceSets.test {
     java.srcDir generatedJpaMetamodelSrcDir
 }
 
+ideaModule {
+    excludeDirs += file("$buildDir/bundles")
+}
+
 task generateJpaMetamodelClasses(type: Compile) {
     classpath = compileTestJava.classpath + configurations.hibernateJpaModelGenTool
     source = sourceSets.test.originalJavaSrcDirs