diff --git a/scripts/indent-c++ b/scripts/indent-c++
index ee9d522e4..db299d518 100755
--- a/scripts/indent-c++
+++ b/scripts/indent-c++
@@ -7,7 +7,9 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-SCRIPTS_DIR=$(dirname $0)
+SCRIPTS_DIR=$(pwd)/$(dirname $0)
 
 uncrustify -l CPP --replace -c ${SCRIPTS_DIR}/uncrustify.cfg $1
-emacs -batch $1 -l ${SCRIPTS_DIR}/indent-c++.el
+
+cd $(dirname $1)
+emacs -batch $(basename $1) -l ${SCRIPTS_DIR}/indent-c++.el
diff --git a/scripts/indent-matlab b/scripts/indent-matlab
index 3a604285d..77772bd9a 100755
--- a/scripts/indent-matlab
+++ b/scripts/indent-matlab
@@ -7,6 +7,7 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-SCRIPTS_DIR=$(dirname $0)
+SCRIPTS_DIR=$(pwd)/$(dirname $0)
 
-emacs -batch $1 -l ${SCRIPTS_DIR}/indent-matlab.el
+cd $(dirname $1)
+emacs -batch $(basename $1) -l ${SCRIPTS_DIR}/indent-matlab.el