diff --git a/build-aux/upgrade-port.sh b/build-aux/upgrade-port.sh
index dda5f262..82d95986 100755
--- a/build-aux/upgrade-port.sh
+++ b/build-aux/upgrade-port.sh
@@ -22,21 +22,24 @@ e2fsprogs)
   UPSTREAM_SITE_TEMPLATE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%v"
   ;;
 binutils|gcc|grub|libstdc++)
-  VERSION_REGEX="sortix-$NAME_REGEXP-([0-9]+\.[0-9]+(\.[0-9]+)*)(-rc[0-9]+)";;
+  VERSION_REGEX="sortix-$NAME_REGEXP-([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
+  ;;
 libcurses)
   UPSTREAM_SITE="https://ftp.barfooze.de/pub/sabotage/tarballs"
   ;;
 libevent)
   VERSION_REGEX="libevent-([0-9]+\\.[0-9]+(\\.[0-9]+)*-stable)"
   UPSTREAM_SITE_TEMPLATE="https://github.com/libevent/libevent/releases/download/release-%v"
-  UPSTREAM_ARCHIVE_TEMPLATE="libevent-%v.tar.gz"
+  UPSTREAM_ARCHIVE_TEMPLATE="libevent-%v%e"
   ;;
 libexpat)
   UPSTREAM_SITE_TEMPLATE="https://github.com/libexpat/libexpat/releases/download/R_%M_%m_%p"
   ;;
 libjpeg)
   UPSTREAM_SITE="https://www.ijg.org/files"
+  # TODO: The last letter is optional but sort -V before the first release.
   VERSION_REGEX="jpegsrc.v([0-9]+[a-z])"
+  UPSTREAM_ARCHIVE_TEMPLATE="jpegsrc.v%v%e"
   ;;
 libgmp)
   VERSION_REGEX=$(echo "$UPSTREAM_ARCHIVE" |