diff --git a/autoport b/autoport
index cbe3442..ac1bb4f 100755
--- a/autoport
+++ b/autoport
@@ -51,7 +51,7 @@ function autoport_log() {
    local logfile=$4
 
    [ "$pkg" -a "$operation" -a "$result" -a "$BATCH_MODE" ] || return
-   echo "$pkg $operation $result $logfile" >> /var/autodist/log/autoport-$PORT_REPOSITORY-current
+   echo "$pkg $operation $result $logfile" >> $DATADIR/autoport-$PORT_REPOSITORY-current
 }
 
 # for webbuild message
@@ -358,8 +358,8 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
             fi
          fi
       done
-      [ -e /var/autodist/log/autoport-$PORT_REPOSITORY-current ] && \
-          mv /var/autodist/log/autoport-$PORT_REPOSITORY-current /var/autodist/log/autoport-$PORT_REPOSITORY-last
+      [ -e $DATADIR/autoport-$PORT_REPOSITORY-current ] && \
+          mv $DATADIR/autoport-$PORT_REPOSITORY-current $DATADIR/autoport-$PORT_REPOSITORY-last
    fi
 
    step=0