diff --git a/archive/org.eclipse.wtp.releng/maps/build.cfg b/archive/org.eclipse.wtp.releng/maps/build.cfg
index 775caae3c28b91077647f489ed13cde79b5afa5a..8092c6aa09e5d611fe76331ffa7e83a905b03dab 100644
--- a/archive/org.eclipse.wtp.releng/maps/build.cfg
+++ b/archive/org.eclipse.wtp.releng/maps/build.cfg
@@ -24,17 +24,21 @@ eclipseBuildURL=http://download.eclipse.org/eclipse/downloads/drops/R-3.1-200506
 
 
 #URL to EMF zip to be downloaded
-emfURL.primary=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200506230200/emf-sdo-xsd-SDK-I200506230200.zip
-emfURL=http://download.eclipse.org/webtools/downloads/drivers/emf-sdo-xsd-SDK-I200506230200.zip
+#emfURL.primary=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200506230200/emf-sdo-xsd-SDK-I200506230200.zip
+emfURL.primary=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/R200507070200/emf-sdo-xsd-SDK-2.1.0.zip
+
+emfURL=http://download.eclipse.org/webtools/downloads/drivers/emf-sdo-xsd-SDK-2.1.0.zip
 #EMF file name
-emfFile=emf-sdo-xsd-SDK-I200506230200.zip
+emfFile=emf-sdo-xsd-SDK-2.1.0.zip
 #EMF build URL
-emfBuildURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/I200506230200
+emfBuildURL=http://download.eclipse.org/tools/emf/downloads/drops/2.1.0/R200507070200
 
 #URL to GEF zip to be downloaded
-gefURL.primary=http://download.eclipse.org/tools/gef/downloads/drops/S-3.1RC4-200506250848/GEF-SDK-3.1RC4.zip
-gefURL=http://download.eclipse.org/webtools/downloads/drivers/GEF-SDK-3.1RC4.zip
-gefFile =GEF-SDK-3.1RC4.zip
+#gefURL.primary=http://download.eclipse.org/tools/gef/downloads/drops/S-3.1RC4-200506250848/GEF-SDK-3.1RC4.zip
+gefURL.primary=http://download.eclipse.org/tools/gef/downloads/drops/R-3.1-200507071758/GEF-SDK-3.1.zip
+
+gefURL=http://download.eclipse.org/webtools/downloads/drivers/GEF-SDK-3.1.zip
+gefFile=GEF-SDK-3.1.zip
 
 #URL to JEM zip to be downloaded
 #jemURL = http://download.eclipse.org/tools/ve/downloads/drops/R-1.0.2-200412091401/JEM-SDK-1.0.2.zip