diff --git a/build.xml b/build.xml
index 99ca592a..055a75d0 100644
--- a/build.xml
+++ b/build.xml
@@ -69,14 +69,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." />
 	
 	<target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast.">
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib" />
-		<ivy:retrieve />
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="ecj" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj" />
 		<ivy:retrieve />
 	</target>
 	
 	<target name="ensureBuildDeps" depends="config-ivy">
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build, javac7" />
 		<ivy:retrieve />
 	</target>
 	
diff --git a/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml b/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml
new file mode 100644
index 00000000..f2c59547
--- /dev/null
+++ b/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="net.java.openjdk.custom" module="javac6" revision="1.6.0.18" publication="20100225011200">
+		<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
+		<description homepage="http://openjdk.java.net/" />
+	</info>
+	<configurations>
+		<conf name="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18-sources.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml b/buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml
similarity index 71%
rename from buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml
rename to buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml
index f2335aa1..2ef76782 100644
--- a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml
+++ b/buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-	<info organisation="projectlombok.org" module="javac" revision="1.6.0.18" publication="20100225011200">
+	<info organisation="net.java.openjdk.custom" module="javac7" revision="1.7.0" publication="20110811230000">
 		<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
 		<description homepage="http://openjdk.java.net/" />
 	</info>
@@ -8,7 +8,7 @@
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac.jar" />
-		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-sources.zip" />
+		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0-sources.zip" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index add6eb44..e226439c 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -8,6 +8,7 @@
 		<conf name="test" extends="build, runtime" />
 		<conf name="contrib" />
 		<conf name="ecj" />
+		<conf name="javac7" />
 	</configurations>
 	<dependencies>
 		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.5" conf="build; runtime->build" />
@@ -27,7 +28,8 @@
 		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" />
 		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" />
 		
-		<dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+		<dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+		<dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
 		<dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" />
 		
 		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
diff --git a/experimental/delombok_java7/NOTE b/experimental/delombok_java7/NOTE
deleted file mode 100644
index 83d9fcaf..00000000
--- a/experimental/delombok_java7/NOTE
+++ /dev/null
@@ -1,2 +0,0 @@
-The provided 'javac7.jar' may not be complete and should not be used for
-anything else but building 'delombok_java7'.
\ No newline at end of file
diff --git a/experimental/delombok_java7/lib/javac7.jar b/experimental/delombok_java7/lib/javac7.jar
deleted file mode 100644
index 66de8262..00000000
Binary files a/experimental/delombok_java7/lib/javac7.jar and /dev/null differ