diff --git a/utils/airtime-log b/utils/airtime-log
index 739678b71..c6053de5e 100755
--- a/utils/airtime-log
+++ b/utils/airtime-log
@@ -28,7 +28,4 @@ SCRIPT=`readlink -f $0`
 # Absolute directory this script is in
 SCRIPTPATH=`dirname $SCRIPT`
 
-invokePwd=$PWD
-cd $SCRIPTPATH
-
-php -q airtime-log.php "$@" || exit 1
+php -q $SCRIPTPATH/airtime-log.php "$@" || exit 1
diff --git a/utils/airtime-log.php b/utils/airtime-log.php
index d3d194a09..692f0f934 100644
--- a/utils/airtime-log.php
+++ b/utils/airtime-log.php
@@ -41,9 +41,12 @@ function viewSpecificLog($key){
     } else printUsage();
 }
 
-function dumpAllLogs(){
+function dumpAllLogs(){   
     $dateStr = gmdate("Y-m-d-H-i-s");
-    $filename = "/tmp/airtime-log-all-$dateStr.tgz";
+
+    $dir = getcwd();
+    
+    $filename = "$dir/airtime-log-all-$dateStr.tgz";
     echo "Creating Airtime logs tgz file at $filename";
     $command = "tar cfz $filename /var/log/airtime 2>/dev/null";
     exec($command);
@@ -54,7 +57,10 @@ function dumpSpecificLog($key){
 
     if (isKeyValid($key)){
         $dateStr = gmdate("Y-m-d-H-i-s");
-        $filename = "/tmp/airtime-log-$key-$dateStr.tgz";
+
+        $dir = getcwd();
+        
+        $filename = "$dir/airtime-log-$key-$dateStr.tgz";
         echo "Creating Airtime logs tgz file at $filename";
         $dir = dirname($log_files[$key]);
         $command = "tar cfz $filename $dir 2>/dev/null";