diff --git a/src/freedombone-image b/src/freedombone-image
index 4b08a891..252c7066 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -202,10 +202,10 @@ if [ ${#imgfiles[@]} -eq 0 ]; then
     exit 1
 fi
 
-mv build/${PROJECT_NAME}*.bz2 $CURR_DIR
-mv build/${PROJECT_NAME}*.img $CURR_DIR
-mv build/${PROJECT_NAME}*.sig $CURR_DIR
-rm -rf $BUILD_DIR
+mv build/${PROJECT_NAME}*.bz2 ${CURR_DIR}
+mv build/${PROJECT_NAME}*.img ${CURR_DIR}
+mv build/${PROJECT_NAME}*.sig ${CURR_DIR}
+rm -rf ${BUILD_DIR}
 
 clear
 echo "
@@ -217,11 +217,12 @@ You will be able to log into it with:
 
     Password: $PASSWORD
 "
+cd ${CURR_DIR}
 ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2
 
 # record the default login credentials for later use
 echo "Username: $USERNAME
-Password: $PASSWORD" > ${PROJECT_NAME}_login_credentials.txt
-chmod 600 ${PROJECT_NAME}_login_credentials.txt
+Password: $PASSWORD" > ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
+chmod 600 ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
 
 exit 0