diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 789de9c6ea4..6a3ab85881f 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -81,9 +81,11 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
 			<property name="builder" value="${basedir}/util"/>
 		</ant>
+		<!--
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
 			<property name="builder" value="${basedir}/dsfgdb"/>
 		</ant>
+		-->
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/platform"/>
 		</ant>
@@ -114,9 +116,11 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/util"/>
 		</ant>
+		<!--
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/dsfgdb"/>
 		</ant>
+		-->
 	</target>
 	
 	<target name="unzip" depends="init" unless="dontUnzip">
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index b8ce7bbbf1a..6b25b41a57f 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -109,7 +109,7 @@ plugin@org.eclipse.cdt.tests.dsf=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cv
 feature@org.eclipse.cdt.examples.dsf=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf/org.eclipse.cdt.examples.dsf-feature
 
 ! DSF-GDB Integration
-plugin@org.eclipse.cdt.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.gdb
-plugin@org.eclipse.cdt.dsf.gdb.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.gdb.ui
-plugin@org.eclipse.cdt.tests.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf/org.eclipse.cdt.tests.dsf.gdb
-feature@org.eclipse.cdt.gnu.dsf=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf/org.eclipse.cdt.gnu.dsf-feature
+plugin@org.eclipse.cdt.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb
+plugin@org.eclipse.cdt.dsf.gdb.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui
+plugin@org.eclipse.cdt.tests.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb
+feature@org.eclipse.cdt.gnu.dsf=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature