diff --git a/scripts/dng.in b/scripts/dng.in
index de5a9cf80a9860a2f8b07444a8f43022eb1005c5..75e4df1b34620db045febeeeee6c4e212be48e64 100755
--- a/scripts/dng.in
+++ b/scripts/dng.in
@@ -22,12 +22,12 @@
 
 # Self detect important directories
 SCRIPT_NAME=$0
-BIN_DIR=`dirname $SCRIPT_NAME`
-export DNG_ROOT=$BIN_DIR/..
-export PATH=$BIN_DIR:$PATH
-export LD_LIBRARY_PATH=$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH
+BIN_DIR=`dirname "$SCRIPT_NAME"`
+export DNG_ROOT=`cd "$BIN_DIR/..";pwd`
+export PATH="$DNG_ROOT/bin:$PATH"
+export LD_LIBRARY_PATH="$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH"
 # set QT_PLUGIN_PATH and pythonpath for bundle (commented except in linux bundles)
-#export PYTHONPATH=$DING_ROOT/@LIBDIR@/python2.6
-#export QT_PLUGIN_PATH=$BIN_DIR/plugins
+#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python2.6"
+#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
 
 gosty $DNG_ROOT/@LIBDIR@/openstructure/init.py ost $@
diff --git a/scripts/ost.in b/scripts/ost.in
index 7239f70a89e6a550e2814e56feb640f9333c3bed..91f701600eee07e1d850981c57ce1d08953596c2 100755
--- a/scripts/ost.in
+++ b/scripts/ost.in
@@ -24,15 +24,15 @@
 # Self detect important directories
 SCRIPT_NAME=$0
 BIN_DIR=`dirname "$SCRIPT_NAME"`
-export DNG_ROOT="$BIN_DIR/.."
-export PATH=$PATH:"$BIN_DIR"
+export DNG_ROOT=`cd "$BIN_DIR/..";pwd`
+export PATH="$DNG_ROOT/bin:$PATH"
 export DYLD_FRAMEWORK_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_FRAMEWORK_PATH}"
 export DYLD_LIBRARY_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_LIBRARY_PATH}"
 
-export LD_LIBRARY_PATH=$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH"
 # set QT_PLUGIN_PATH and pythonpath for bundle (commented except in linux bundles)
 #export QT_PLUGIN_PATH="$BIN_DIR/plugins"
-#export PYTHONPATH=$DING_ROOT/@LIBDIR@/python2.6
+#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python2.6"
 
 # retrieve absolute path to python executable
 pyexec=""