diff --git a/bin/sparky b/bin/sparky
index 8b51212..270723a 100644
--- a/bin/sparky
+++ b/bin/sparky
@@ -4,18 +4,6 @@
 #
 
 # -----------------------------------------------------------------------------
-# Figure out Sparky installation directory from $0.
-#
-set sparky_exe = "$0"
-while (-l "$sparky_exe")
-  set ls_sparky_exe = `ls -l "$sparky_exe"`
-  set sparky_exe = `echo "$ls_sparky_exe" | sed 's/.* -> //'`
-end
-set sparky_bin = `dirname "$sparky_exe"`
-set sparky_bin = `cd "$sparky_bin"; pwd`
-set sparky_inst = `dirname "$sparky_bin"`
-
-# -----------------------------------------------------------------------------
 # Sparky uses the SPARKY_INSTALL environment variable to find its
 # application resource file and print prolog file.
 #
@@ -25,7 +13,7 @@ setenv SPARKY_INSTALL		"$sparky_inst"
 # If Python is available start Sparky as a Python extension.
 # Otherwise the standalone version of Sparky is started.
 #
-set PYTHON = "$SPARKY_INSTALL/python2.5/bin/python2.5"
+set PYTHON = GENTOO_PYTHON
 if (! -e "$PYTHON") then
   set PYTHON = python2.5
 endif
@@ -79,7 +67,7 @@ if ($status == 0) then
   # ---------------------------------------------------------------------------
   # Add the Sparky package and Tkinter to the Python path
   #
-  set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/lib-tk"
+  set SPARKY_PYTHONPATH = "$SPARKY_INSTALL/python:$SPARKY_INSTALL/python/sparky"
   if ($?PYTHONPATH) then
     setenv PYTHONPATH "${SPARKY_PYTHONPATH}:$PYTHONPATH"
   else