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-09-18 17:04:12.185250256 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh	2014-09-18 17:46:08.236860205 -0400
@@ -70,27 +70,33 @@ while test $# -gt 0 ; do
   esac
 done
 
+ECLIPSE_HOME=@ECLIPSE_HOME@
+
 # Make sure local directory exists and has contents initialized
-if [ ! -d "$HOME/cdtdebugger" ]; then
-  /bin/sh "$SCRIPT_DIR/install.sh" || exit
+if [ $0 -nt $HOME/rhcdtdebugger ]; then
+rm -rf $HOME/rhcdtdebugger >/dev/null
+mkdir -p $HOME/rhcdtdebugger
+cp config.ini $HOME/rhcdtdebugger
+cp dev.properties $HOME/rhcdtdebugger
 fi
 
 # Calculate platform-specific jar file names
-ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd)  # install.sh will modify this line.  DO NOT REMOVE THE FOLLOWING MARKER: @#@#
 PLUGIN_DIR="$ECLIPSE_HOME/plugins"
+CDT_PLUGIN_DIR="@CDT_DROPINS@"
 
 OSGI_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.osgi_*.jar' -not -name '*source*' -printf "%f\n" | head -1`
-SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*.jar' -not -name '*source*' -printf "%f\n" | head -1`
+SWT_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.swt.*' -not -name '*source*' -printf "%f\n" | head -1`
 SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"`
 FS_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.core.filesystem.*.jar' -not -name '*source*' -printf "%f\n" | grep -v java7 | head -1`
 FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"`
-LINUX_JAR=`find "$PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -printf "%f\n" | head -1`
+LINUX_JAR=`find "$CDT_PLUGIN_DIR" -maxdepth 1 -name 'org.eclipse.cdt.core.linux.*.jar' -not -name '*source*' -printf "%f\n" | head -1`
 LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"`
 
 # Run eclipse with the Stand-alone Debugger product specified
 "$ECLIPSE_HOME/eclipse" -clean -product org.eclipse.cdt.debug.application.product \
-                        -data "$HOME/workspace-cdtdebug" -configuration file\:"$HOME/cdtdebugger" \
-                        -dev file\:"$HOME/cdtdebugger/dev.properties" $options \
+                        -application org.eclipse.cdt.debug.application.app \
+                        -data "$HOME/workspace-rhcdtdebug" -configuration file\:"$HOME/rhcdtdebugger" \
+                        -dev file\:"$HOME/rhcdtdebugger/dev.properties" $options \
                         -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \
                         -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home="$ECLIPSE_HOME"
 
diff -up ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/install.sh
--- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix	2014-09-18 17:01:20.261391170 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh	2014-09-18 17:02:00.398058628 -0400
@@ -10,34 +10,4 @@
 #    Red Hat Inc. - initial API and implementation
 ###############################################################################
 
-# Verify that the install script is being run from a plug-ins folder of a
-# downloaded Eclipse and not in a local user .eclipse folder.
-
-SCRIPT_DIR=`dirname $0`
-
-if [ ! -f "$SCRIPT_DIR/../../../eclipse" ]; then
-  echo "$0: error: eclipse executable not found in expected location"
-  echo " "
-  echo "This can occur if you are running this script from your local .eclipse directory"
-  echo "which would mean you are running a shared instance of the Eclipse platform for"
-  echo "your distro and have installed the Stand-alone Debugger from an eclipse.org"
-  echo "download repo.  Downloading the Stand-alone Debugger feature on top of a distro"
-  echo "version of Eclipse Debugger is not supported.  If you are using a distro version"
-  echo "of the Eclipse platform, you should not use this script.  Instead, install the"
-  echo "corresponding Eclipse CDT package for your distro (e.g. eclipse-cdt package)"
-  echo "which will install the Stand-alone Debugger for you."
-  exit 1
-fi
-
-if [ ! -d "$HOME/cdtdebugger" ]; then
-  mkdir -p "$HOME/cdtdebugger"
-fi
-cp "$SCRIPT_DIR/config.ini" "$HOME/cdtdebugger"
-cp "$SCRIPT_DIR/dev.properties" "$HOME/cdtdebugger"
-cp "$SCRIPT_DIR/cdtdebug.sh" "$HOME/cdtdebugger"
-chmod +x "$HOME/cdtdebugger/cdtdebug.sh"
-
-ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd)
-# Replace the entire line with tag @#@# by the actual location of the eclipse installation
-sed -i -e "s,^.*@#@#.*$,ECLIPSE_HOME=$ECLIPSE_HOME," "$HOME/cdtdebugger/cdtdebug.sh"
-echo "Installation complete"
+echo "Installation already done"
diff -up ./debug/org.eclipse.cdt.debug.application/scripts/README.fix ./debug/org.eclipse.cdt.debug.application/scripts/README
--- ./debug/org.eclipse.cdt.debug.application/scripts/README.fix	2014-09-18 17:38:12.868978973 -0400
+++ ./debug/org.eclipse.cdt.debug.application/scripts/README	2014-09-18 17:43:27.474194808 -0400
@@ -3,15 +3,11 @@ is needed of the CDT plug-ins to debug a
 Editing is allowed, but you will need to rebuild outside the Stand-alone Debugger for
 those changes to manifest in your debugging session.
 
-To install the Stand-alone debugger locally in your $HOME directory, run the install.sh
-script found in the scripts sub-directory of the plugins directory in your Eclipse installation:
+Running the debugger for the first time will create a rhcdtdebugger directory in your $HOME directory.
+This directory will contain a config.ini file and a dev.properties file.
 
-  ./install.sh
-
-The install script will create a cdtdebugger directory in your $HOME directory.  This
-directory will contain a config.ini file, a dev.properties file, and a cdtdebug.sh script.
-The cdtdebug.sh script will start the debugger from the command-line.  The cdtdebug.sh script
-does not have to be located in the cdtdebugger directory and can be moved if you prefer.
+Use the cdtdebug command to start the debugger from the command-line.  The cdtdebug command is
+actually a script that is installed on the default PATH.
 
 The script takes a few options which are mentioned below:
 
@@ -39,8 +35,5 @@ If no -a or -e option is specified, the
 debugging.  Otherwise, if this is the first time, a dialog will be presented to enter
 an executable, build log, and program arguments.
 
-  e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2
-
-The cdtdebug.sh script that is found in the plug-in can also be run directly, but cannot
-be moved.  The one installed in the cdtdebugger directory on the other hand, can be moved.
+  e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2