diff -up ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
--- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix	2014-06-03 15:04:05.484431542 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh	2014-06-03 15:15:02.415172277 -0400
@@ -9,23 +9,26 @@
 # Contributors:
 #    Red Hat Inc. - initial API and implementation
 ###############################################################################
+ECLIPSE_HOME=@ECLIPSE_HOME@
 if [ ! -d $HOME/cdtdebugger ]; then
 mkdir -p $HOME/cdtdebugger
 cp config.ini $HOME/cdtdebugger
 cp dev.properties $HOME/cdtdebugger
 fi
-pushd ../.. >/dev/null
+pushd $ECLIPSE_HOME/plugins >/dev/null
 OSGI_JAR=`ls org.eclipse.osgi_*.jar`
-SWT_JAR=`ls org.eclipse.swt.*.jar`
+SWT_JAR=`ls -d org.eclipse.swt.*`
 SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"`
-FS_JAR=`ls org.eclipse.core.filesystem.*.jar`
+FS_JAR=`ls org.eclipse.core.filesystem.*.jar | grep -v java7`
 FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"`
+popd >/dev/null
+pushd @CDT_DROPINS@ >/dev/null
 LINUX_JAR=`ls org.eclipse.cdt.core.linux.*.jar`
 LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"`
-cd ..; ECLIPSE_HOME=`pwd`
 popd >/dev/null
 $ECLIPSE_HOME/eclipse -clean -product org.eclipse.cdt.debug.application.product \
--data $HOME/workspace-gdbstandlone -configuration file\:$HOME/cdtdebugger \
+-application org.eclipse.cdt.debug.application.app \
+-data $HOME/workspace-cdtdebug -configuration file\:$HOME/cdtdebugger \
 -dev file\:$HOME/cdtdebugger/dev.properties $@ \
 -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \
 -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home=$ECLIPSE_HOME