diff --git a/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml
new file mode 100644
index 00000000..fe812bbc
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="core.runtime" revision="3.6.0" publication="20100505120000">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.0.xml
similarity index 72%
rename from buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
rename to buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.0.xml
index e3b8aceb..6ea9088e 100644
--- a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="ecj" revision="3.6.0" publication="20100608091100">
+	<info organisation="org.eclipse.custom" module="ecj" revision="3.6.0" publication="20100608091100">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar" />
+		<artifact conf="default" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar" />
 		<artifact type="zip" conf="sources" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml
new file mode 100644
index 00000000..889a2ceb
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="equinox.common" revision="3.6.0" publication="20100503120000">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503-sources.jar" />
+	</publications>
+</ivy-module>
\ No newline at end of file
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml
similarity index 71%
rename from buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
rename to buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml
index 7a3225d8..f9a8f52d 100644
--- a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.core" revision="3.6.0" publication="20100505120000">
+	<info organisation="org.eclipse.custom" module="jdt.core" revision="3.6.0" publication="20100505120000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml
similarity index 72%
rename from buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml
rename to buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml
index 6244df5b..dbee2865 100644
--- a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml
+++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.ui" revision="3.6.0" publication="20100602160000">
+	<info organisation="org.eclipse.custom" module="jdt.ui" revision="3.6.0" publication="20100602160000">
 		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
 		<description homepage="http://www.eclipse.org/eclipse/" />
 	</info>
 	<configurations>
-		<conf name="runtime" />
+		<conf name="default" />
 		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" />
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" />
 		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600-sources.jar" />
 	</publications>
 </ivy-module>
diff --git a/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml
new file mode 100644
index 00000000..93a7f381
--- /dev/null
+++ b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.eclipse.custom" module="osgi" revision="3.6.0" publication="20100517120000">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517-sources.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 83bd3a19..4d3bb679 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -26,17 +26,17 @@
 		<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="eclipse.org" name="ecj" rev="3.6.0" conf="build->runtime; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="ecj" rev="3.6.0" conf="build->default; contrib->sources" />
 		
 		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="openide.util" rev="6.8beta" conf="netbeansBuild->build" />
 		<dependency org="netbeans.org" name="modules.java.source" rev="6.8beta" conf="netbeansBuild->build" />
 		
-		<dependency org="org.eclipse.core" name="org.eclipse.core.runtime" rev="3.6.0.v20100505" conf="eclipseBuild->default; contrib->sources" />
-		<dependency org="eclipse.org" name="jdt.core" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
-		<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.common" rev="3.6.0.v20100503" conf="eclipseBuild->default; contrib->sources" />
-		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.6.0.v20100517" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="core.runtime" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.core" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="equinox.common" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
+		<dependency org="org.eclipse.custom" name="osgi" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" />
 	</dependencies>
 </ivy-module>