diff --git a/copy-firmware.sh b/copy-firmware.sh
index 6757c6ce03a3..fc096dd6daf0 100755
--- a/copy-firmware.sh
+++ b/copy-firmware.sh
@@ -136,9 +136,15 @@ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
         if test -d "$target"; then
             $verbose "creating link $f -> $d"
             ln -s "$d" "$destdir/$f"
-        else
+        elif test -f "$target$compext"; then
             $verbose "creating link $f$compext -> $d$compext"
             ln -s "$d$compext" "$destdir/$f$compext"
+        elif test -f "$target"; then
+            $verbose "creating link $f -> $d"
+            ln -s "$d" "$destdir/$f"
+        else
+            $verbose "creating link (not yet existing) $f$compext -> $d$compext"
+            ln -s "$d$compext" "$destdir/$f$compext"
         fi
     fi
 done