diff --git a/openwrtbuilder b/openwrtbuilder
index d68f670..871d73c 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -700,10 +700,23 @@ fromSource() {
     make "${make_opts[@]}" -j"$(nproc)" world
 
     popd &>/dev/null || return 1
+
+    moveSourceImage
+
     exit
 }
 
 
+# Make the output tree match Image Builder's (non-destructively) 
+moveSourceImage() {
+    declare out_file
+    declare -a out_files=("$THIS_BINDIR/targets/${P_ARR[target]}/"*.{img,img.gz,ubi})
+    for out_file in "${out_files[@]}"; do
+        [[ -f $out_file ]] && ln -s "$out_file" "$THIS_BINDIR/${out_file##*/}"
+    done
+}
+
+
 debug() { (( DEBUG )) && echo "Debug: $*"; }
 
 
diff --git a/profiles b/profiles
index d8f0866..7fafb7a 100644
--- a/profiles
+++ b/profiles
@@ -11,7 +11,7 @@ default_packages="\
 	htop \
 	diffutils \
 	tar \
-	iperf \
+	iperf3 \
 	bash \
 	rsync \
 	openssh-sftp-server \