diff --git a/README.adoc b/README.adoc
index 48ee6d1..b864761 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1983,7 +1983,7 @@ To enable initrd instead of the default ext2 disk image, do:
 Notice how it boots fine, even though this leads to not giving QEMU the `-drive` option, as can be verified with:
 
 ....
-cat ./out/x86_64/run.sh
+cat ./out/x86_64/qemu/run.sh
 ....
 
 Also as expected, there is no filesystem persistency, since we are doing everything in memory:
@@ -4818,7 +4818,13 @@ Stdout shows a line with the full command of type:
 and this line is also saved to a file for convenience:
 
 ....
-cat ./out/arm/run.sh
+cat ./out/arm/qemu/run.sh
+....
+
+or for gem5:
+
+....
+cat ./out/arm/gem5/run.sh
 ....
 
 Next, you will also want to give the relevant images to save them time. Zip the images with:
diff --git a/common b/common
index e3b10ee..1a20e0d 100644
--- a/common
+++ b/common
@@ -36,6 +36,11 @@ set_common_vars() {
   m5out_dir="${gem5_out_dir}/m5out"
   qemu_out_dir="${out_arch_dir}/qemu"
   qemu_trace_txt_file="${qemu_out_dir}/trace.txt"
+  if "$gem5"; then
+    common_out_run_dir="$gem5_out_dir"
+  else
+    common_out_run_dir="$qemu_out_dir"
+  fi
 }
 root_dir="$(pwd)"
 out_dir="${root_dir}/out"
diff --git a/run b/run
index cfcda49..1a0e185 100755
--- a/run
+++ b/run
@@ -287,4 +287,4 @@ if "$tmux"; then
     eval "./tmu 'sleep 2;./gem5-shell'"
   fi
 fi
-"${root_dir}/eeval" "$cmd" "${out_arch_dir}/run.sh"
+"${root_dir}/eeval" "$cmd" "${common_out_run_dir}/run.sh"
diff --git a/rungdb b/rungdb
index 4a46d00..1aa9cb6 100755
--- a/rungdb
+++ b/rungdb
@@ -88,4 +88,4 @@ ${brk} \
 ${lx_symbols} \
 "
 fi
-"${root_dir}/eeval" "$cmd $after" "${out_arch_dir}/rungdb.sh"
+"${root_dir}/eeval" "$cmd $after" "${common_out_run_dir}/rungdb.sh"