diff --git a/bbb-convert-stage-5.sh b/bbb-convert-stage-5.sh
index 86568c3..84d2806 100755
--- a/bbb-convert-stage-5.sh
+++ b/bbb-convert-stage-5.sh
@@ -245,7 +245,8 @@ do_install_bootloader() {
   # Map & mount Mender compliant image.
   create_device_maps $mender_disk_image mender_disk_mappings
 
-  mkdir -p $output_dir && cd $output_dir
+  # Change current directory to 'output' directory.
+  cd $output_dir
 
   boot=${mender_disk_mappings[0]}
   primary=${mender_disk_mappings[1]}
diff --git a/convert-stage-4.sh b/convert-stage-4.sh
index 6706200..72b62d4 100755
--- a/convert-stage-4.sh
+++ b/convert-stage-4.sh
@@ -267,7 +267,8 @@ do_install_mender() {
   # Mount rootfs partition A.
   create_device_maps $mender_disk_image mender_disk_mappings
 
-  mkdir -p $output_dir && cd $output_dir
+  # Change current directory to 'output' directory.
+  cd $output_dir
 
   primary=${mender_disk_mappings[1]}
   data=${mender_disk_mappings[3]}
diff --git a/mender-convert b/mender-convert
index 79eaa95..7f5fa01 100755
--- a/mender-convert
+++ b/mender-convert
@@ -269,7 +269,8 @@ do_raw_disk_image_create_partitions() {
   [[ $supported -eq 0 ]] && \
       { log "Error: incorrect device type. Aborting."; return 1; }
 
-  mkdir -p $output_dir && cd $output_dir
+  # Change current directory to 'output' directory.
+  cd $output_dir
 
   # Make sure the user's given Mender image name has a correct extension.
   # If Mender image name is not provided, then use following syntax:
@@ -683,6 +684,9 @@ export -f mount_mender_disk
 export -f log
 export -f logsetup
 
+# Before running any command first create output directory
+# and configure where logs should be redirected.
+mkdir -p $output_dir
 logsetup
 
 while (( "$#" )); do
diff --git a/mender-convert-functions.sh b/mender-convert-functions.sh
index 1b84470..7127ecc 100755
--- a/mender-convert-functions.sh
+++ b/mender-convert-functions.sh
@@ -28,6 +28,7 @@ sdimg_secondary_dir=$sdimg_base_dir/secondary
 sdimg_data_dir=$sdimg_base_dir/data
 
 logsetup() {
+  [ ! -f $build_log ] && { touch $build_log; }
   echo -n "" > $build_log
   exec > >(tee -a $build_log)
   exec 2>&1
diff --git a/rpi3-convert-stage-5.sh b/rpi3-convert-stage-5.sh
index d393716..d76a190 100755
--- a/rpi3-convert-stage-5.sh
+++ b/rpi3-convert-stage-5.sh
@@ -22,6 +22,7 @@ bin_base_dir=${output_dir}/bin
 bin_dir_pi=${bin_base_dir}/raspberrypi
 sdimg_base_dir=$output_dir/sdimg
 GCC_VERSION="6.3.1"
+build_log=${output_dir}/build.log
 
 declare -a mender_disk_mappings
 declare -a mender_disk_partitions=("boot" "primary" "secondary" "data")
@@ -176,7 +177,8 @@ do_install_bootloader() {
   # Map & mount Mender compliant image.
   create_device_maps $mender_disk_image mender_disk_mappings
 
-  mkdir -p $output_dir && cd $output_dir
+  # Change current directory to 'output' directory.
+  cd $output_dir
 
   # Build patched U-Boot files.
   build_uboot_files $bootloader_toolchain