diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml
deleted file mode 100644
index d57eb367..00000000
--- a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="core.runtime" revision="3.5.0" publication="20100419062500">
-		<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="build" />
-	</configurations>
-	<publications>
-		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml
new file mode 100644
index 00000000..d1232780
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" 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="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" 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.5.2.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml
deleted file mode 100644
index b5d37c26..00000000
--- a/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="ecj" revision="3.5.2" publication="20100309090400">
-		<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="sources" />
-	</configurations>
-	<publications>
-		<artifact conf="runtime" url="http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecj-3.5.2.jar" />
-		<artifact type="zip" conf="sources" url="http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
new file mode 100644
index 00000000..3217003e
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" 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="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://eclipse.a3-system.be/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar" />
+		<artifact type="zip" conf="sources" url="http://eclipse.mirror.kangaroot.net/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml
deleted file mode 100644
index 865f3455..00000000
--- a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="equinox.common" revision="3.5.0" publication="20100419062500">
-		<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="build" />
-	</configurations>
-	<publications>
-		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml
new file mode 100644
index 00000000..acb748b0
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" 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="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" 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>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
similarity index 51%
rename from buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml
rename to buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
index 22b0623f..7a3225d8 100644
--- a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml
+++ b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml
@@ -1,12 +1,14 @@
 <ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.core" revision="3.5.0" publication="20100419062500">
+	<info organisation="eclipse.org" 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="build" />
+		<conf name="runtime" />
+		<conf name="sources" />
 	</configurations>
 	<publications>
-		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar" />
+		<artifact conf="runtime" 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.5.1.xml b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml
deleted file mode 100644
index 75867b4f..00000000
--- a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="jdt.ui" revision="3.5.1" publication="20100419062500">
-		<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="build" />
-	</configurations>
-	<publications>
-		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml
new file mode 100644
index 00000000..6244df5b
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" 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="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" 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/eclipse.org-osgi-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml
deleted file mode 100644
index 62a6d3d4..00000000
--- a/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="eclipse.org" module="osgi" revision="3.5.0" publication="20100419062500">
-		<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="build" />
-	</configurations>
-	<publications>
-		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar" />
-	</publications>
-</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml
new file mode 100644
index 00000000..55bae381
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" 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="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" 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 4bcce7c8..8e0e9f1e 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -23,17 +23,17 @@
 		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->master" />
 		
 		<dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
-		<dependency org="eclipse.org" name="ecj" rev="3.5.2" conf="build->runtime; contrib->sources" />
+		<dependency org="eclipse.org" name="ecj" rev="3.6.0" conf="build->runtime; 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="eclipse.org" name="core.runtime" rev="3.5.0" conf="eclipseBuild->build" />
-		<dependency org="eclipse.org" name="equinox.common" rev="3.5.0" conf="eclipseBuild->build" />
-		<dependency org="eclipse.org" name="jdt.core" rev="3.5.0" conf="eclipseBuild->build" />
-		<dependency org="eclipse.org" name="jdt.ui" rev="3.5.1" conf="eclipseBuild->build" />
-		<dependency org="eclipse.org" name="osgi" rev="3.5.0" conf="eclipseBuild->build" />
+		<dependency org="eclipse.org" name="core.runtime" rev="3.6.0" conf="eclipseBuild->runtime; 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="eclipse.org" name="equinox.common" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
+		<dependency org="eclipse.org" name="osgi" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" />
 	</dependencies>
 </ivy-module>