diff --git a/ports/unofficial/stable/axel/build b/ports/official/core/axel/build
similarity index 100%
rename from ports/unofficial/stable/axel/build
rename to ports/official/core/axel/build
diff --git a/ports/unofficial/stable/axel/checksums b/ports/official/core/axel/checksums
similarity index 100%
rename from ports/unofficial/stable/axel/checksums
rename to ports/official/core/axel/checksums
diff --git a/ports/unofficial/stable/axel/depends b/ports/official/core/axel/depends
similarity index 100%
rename from ports/unofficial/stable/axel/depends
rename to ports/official/core/axel/depends
diff --git a/ports/unofficial/stable/axel/sources b/ports/official/core/axel/sources
similarity index 100%
rename from ports/unofficial/stable/axel/sources
rename to ports/official/core/axel/sources
diff --git a/ports/unofficial/stable/axel/version b/ports/official/core/axel/version
similarity index 100%
rename from ports/unofficial/stable/axel/version
rename to ports/official/core/axel/version
diff --git a/ports/official/core/kiss/depends b/ports/official/core/kiss/depends
deleted file mode 100644
index 5664e30..0000000
--- a/ports/official/core/kiss/depends
+++ /dev/null
@@ -1 +0,0 @@
-git
diff --git a/ports/official/core/netbsd-curses/build b/ports/official/core/netbsd-curses/build
index f232434..19fe62e 100755
--- a/ports/official/core/netbsd-curses/build
+++ b/ports/official/core/netbsd-curses/build
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-make CFLAGS="$CFLAGS"
+make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 make DESTDIR="$1" PREFIX=/usr install
diff --git a/ports/official/core/otawk-git/sources b/ports/official/core/otawk-git/sources
deleted file mode 100644
index 36624d4..0000000
--- a/ports/official/core/otawk-git/sources
+++ /dev/null
@@ -1 +0,0 @@
-git+https://github.com/onetrueawk/awk.git
diff --git a/ports/official/core/otawk-git/build b/ports/official/core/otawk/build
similarity index 100%
rename from ports/official/core/otawk-git/build
rename to ports/official/core/otawk/build
diff --git a/ports/official/core/otawk/checksums b/ports/official/core/otawk/checksums
new file mode 100644
index 0000000..0b11bb0
--- /dev/null
+++ b/ports/official/core/otawk/checksums
@@ -0,0 +1 @@
+e5a3d5374db6076eaceacd55e9f980e11136662689ddc46c3329997da3a3d84b
diff --git a/ports/official/core/otawk/sources b/ports/official/core/otawk/sources
new file mode 100644
index 0000000..8c234f7
--- /dev/null
+++ b/ports/official/core/otawk/sources
@@ -0,0 +1 @@
+https://git.sdf.org/midfavila/awk/archive/rel0.tar.gz
diff --git a/ports/official/core/otawk-git/version b/ports/official/core/otawk/version
similarity index 100%
rename from ports/official/core/otawk-git/version
rename to ports/official/core/otawk/version
diff --git a/ports/official/core/sbase-git/sources b/ports/official/core/sbase-git/sources
deleted file mode 100644
index 0c7f4d4..0000000
--- a/ports/official/core/sbase-git/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-git+git://git.suckless.org/sbase
-files/makefile.mid
diff --git a/ports/official/core/sbase-git/README b/ports/official/core/sbase/README
similarity index 100%
rename from ports/official/core/sbase-git/README
rename to ports/official/core/sbase/README
diff --git a/ports/official/core/sbase-git/build b/ports/official/core/sbase/build
similarity index 100%
rename from ports/official/core/sbase-git/build
rename to ports/official/core/sbase/build
diff --git a/ports/official/core/sbase-git/checksums b/ports/official/core/sbase/checksums
similarity index 50%
rename from ports/official/core/sbase-git/checksums
rename to ports/official/core/sbase/checksums
index f5a46a0..1d23d7e 100644
--- a/ports/official/core/sbase-git/checksums
+++ b/ports/official/core/sbase/checksums
@@ -1 +1,2 @@
+0df705dcc7589a6926d9349813285fe673fd2eece5a95bd0840f00b46f964e34
 cad76f664e1af74c8a102cc9742cd8a130abc89b7a44da71e8cb1023c0c4da5c
diff --git a/ports/official/core/sbase-git/files/makefile.mid b/ports/official/core/sbase/files/makefile.mid
similarity index 100%
rename from ports/official/core/sbase-git/files/makefile.mid
rename to ports/official/core/sbase/files/makefile.mid
diff --git a/ports/official/core/sbase/sources b/ports/official/core/sbase/sources
new file mode 100644
index 0000000..e1773f5
--- /dev/null
+++ b/ports/official/core/sbase/sources
@@ -0,0 +1,2 @@
+https://git.sdf.org/midfavila/sbase/archive/rel0.tar.gz
+files/makefile.mid
diff --git a/ports/official/core/sbase-git/version b/ports/official/core/sbase/version
similarity index 100%
rename from ports/official/core/sbase-git/version
rename to ports/official/core/sbase/version
diff --git a/ports/official/core/ubase-git/README b/ports/official/core/ubase/README
similarity index 100%
rename from ports/official/core/ubase-git/README
rename to ports/official/core/ubase/README
diff --git a/ports/official/core/ubase-git/build b/ports/official/core/ubase/build
similarity index 100%
rename from ports/official/core/ubase-git/build
rename to ports/official/core/ubase/build
diff --git a/ports/official/core/ubase-git/checksums b/ports/official/core/ubase/checksums
similarity index 75%
rename from ports/official/core/ubase-git/checksums
rename to ports/official/core/ubase/checksums
index 8c8c1cc..61b06d0 100644
--- a/ports/official/core/ubase-git/checksums
+++ b/ports/official/core/ubase/checksums
@@ -1,3 +1,4 @@
+628770a9b0d2ccab618d3d5b9bec85e2c2180169dd94449c67ba69283c43cbf7
 714715936ff5e8a3574a41031cfbf05d4b061f19fcc07175e717f5db70b7f8e4
 4b2932a50164230b0defd4de008e423babf053bac823930258378b0efee64065
 0fba4476fd5cdf9d6b5d1c5847c6ff65e462c6dcec849c795b25c45cdcb1b002
diff --git a/ports/official/core/ubase-git/files/makefile.mid b/ports/official/core/ubase/files/makefile.mid
similarity index 100%
rename from ports/official/core/ubase-git/files/makefile.mid
rename to ports/official/core/ubase/files/makefile.mid
diff --git a/ports/official/core/ubase-git/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch b/ports/official/core/ubase/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch
similarity index 100%
rename from ports/official/core/ubase-git/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch
rename to ports/official/core/ubase/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch
diff --git a/ports/official/core/ubase-git/patches/fix-mount.patch b/ports/official/core/ubase/patches/fix-mount.patch
similarity index 100%
rename from ports/official/core/ubase-git/patches/fix-mount.patch
rename to ports/official/core/ubase/patches/fix-mount.patch
diff --git a/ports/official/core/ubase-git/sources b/ports/official/core/ubase/sources
similarity index 63%
rename from ports/official/core/ubase-git/sources
rename to ports/official/core/ubase/sources
index 4f55bc5..95dad49 100644
--- a/ports/official/core/ubase-git/sources
+++ b/ports/official/core/ubase/sources
@@ -1,4 +1,4 @@
-git+git://git.suckless.org/ubase
+https://git.sdf.org/midfavila/ubase/archive/rel0.tar.gz
 patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch
 patches/fix-mount.patch
 files/makefile.mid
diff --git a/ports/official/core/ubase-git/version b/ports/official/core/ubase/version
similarity index 100%
rename from ports/official/core/ubase-git/version
rename to ports/official/core/ubase/version
diff --git a/ports/official/extra/curl/build b/ports/official/extra/curl/build
new file mode 100755
index 0000000..9d38452
--- /dev/null
+++ b/ports/official/extra/curl/build
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --disable-ipv6 \
+    --enable-unix-sockets \
+    --enable-hidden-symbols \
+    --without-libidn \
+    --without-libidn2 \
+    --disable-manual \
+    --disable-ldap \
+    --disable-ares \
+    --disable-ftp \
+    --disable-rtsp \
+    --disable-file \
+    --disable-proxy \
+    --disable-dict \
+    --disable-telnet \
+    --disable-tftp \
+    --disable-pop3 \
+    --disable-imap \
+    --disable-smb \
+    --disable-smtp \
+    --disable-gopher \
+    --disable-mqtt \
+    --enable-pthreads \
+    --without-librtmp \
+    --without-icu \
+    --without-libpsl \
+    --with-pic \
+    --with-openssl \
+    --with-ca-fallback
+
+make curl_LDFLAGS=-all-static
+make DESTDIR="$1" install
diff --git a/ports/official/core/curl/build b/ports/official/extra/curl/build~
similarity index 57%
rename from ports/official/core/curl/build
rename to ports/official/extra/curl/build~
index ac49964..d1bfd6b 100755
--- a/ports/official/core/curl/build
+++ b/ports/official/extra/curl/build~
@@ -2,7 +2,6 @@
 
 ./configure \
     --prefix=/usr \
-    --enable-ipv6 \
     --enable-unix-sockets \
     --enable-hidden-symbols \
     --without-libidn \
@@ -10,6 +9,20 @@
     --disable-manual \
     --disable-ldap \
     --disable-ares \
+    --disable-ftp \
+    --disable-rtsp \
+    --disable-file \
+    --disable-proxy \
+    --disable-dict \
+    --disable-telnet \
+    --disable-tftp \
+    --disable-pop3 \
+    --disable-imap \
+    --disable-smb \
+    --disable-smtp \
+    --disable-gopher \
+    --disable-mqtt \
+    --enable-pthreads \
     --without-librtmp \
     --without-icu \
     --without-libpsl \
diff --git a/ports/official/core/curl/checksums b/ports/official/extra/curl/checksums
similarity index 100%
rename from ports/official/core/curl/checksums
rename to ports/official/extra/curl/checksums
diff --git a/ports/official/core/curl/depends b/ports/official/extra/curl/depends
similarity index 100%
rename from ports/official/core/curl/depends
rename to ports/official/extra/curl/depends
diff --git a/ports/official/core/curl/sources b/ports/official/extra/curl/sources
similarity index 100%
rename from ports/official/core/curl/sources
rename to ports/official/extra/curl/sources
diff --git a/ports/official/core/curl/version b/ports/official/extra/curl/version
similarity index 100%
rename from ports/official/core/curl/version
rename to ports/official/extra/curl/version
diff --git a/ports/official/core/git/build b/ports/official/extra/git/build
similarity index 100%
rename from ports/official/core/git/build
rename to ports/official/extra/git/build
diff --git a/ports/official/core/git/checksums b/ports/official/extra/git/checksums
similarity index 100%
rename from ports/official/core/git/checksums
rename to ports/official/extra/git/checksums
diff --git a/ports/official/core/git/depends b/ports/official/extra/git/depends
similarity index 100%
rename from ports/official/core/git/depends
rename to ports/official/extra/git/depends
diff --git a/ports/official/core/git/sources b/ports/official/extra/git/sources
similarity index 100%
rename from ports/official/core/git/sources
rename to ports/official/extra/git/sources
diff --git a/ports/official/core/git/version b/ports/official/extra/git/version
similarity index 100%
rename from ports/official/core/git/version
rename to ports/official/extra/git/version
diff --git a/ports/unofficial/stable/kiss-mod/README b/ports/unofficial/stable/kiss-mod/README
deleted file mode 100644
index 3d8fa2f..0000000
--- a/ports/unofficial/stable/kiss-mod/README
+++ /dev/null
@@ -1,6 +0,0 @@
-ACHTUNG!
-
-This is a modified version of KISS. It does not install documentation or wiki
-pages by default, and it does not rely on curl; instead, it uses a simpler tool
-called axel. axel is multithreaded and therefore can complete larger downloads
-much more quickly; it also supports non-HTTP/S protocols.
diff --git a/ports/unofficial/stable/kiss-mod/build b/ports/unofficial/stable/kiss-mod/build
deleted file mode 100755
index af9f565..0000000
--- a/ports/unofficial/stable/kiss-mod/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-mkdir -p "$1/usr/bin"
-
-# Replace curl with axel. Increases download performance and supports FTP/S.
-sed -i 's/curl "$src" -fLo/axel "$src" -o/' kiss
-
-# Remove -reset and -outdated
-rm contrib/kiss-reset
-rm contrib/kiss-outdated
-
-# Install kiss utilities.
-cp -f kiss contrib/* "$1/usr/bin/"
diff --git a/ports/unofficial/stable/kiss-mod/checksums b/ports/unofficial/stable/kiss-mod/checksums
deleted file mode 100644
index e0e74c2..0000000
--- a/ports/unofficial/stable/kiss-mod/checksums
+++ /dev/null
@@ -1,3 +0,0 @@
-628feccdedef85f7369d49c850bd494c3b2aa39c07354f1501cb7ce5914765d3
-f4a83d29235f1549086da6ea445a363cd8a1874f4ebca073c2d55bb5aca383bc
-22da43f0b83244d457e12a82776b053ab0958d3d27c41ad711915ea1cd778811
diff --git a/ports/unofficial/stable/kiss-mod/depends b/ports/unofficial/stable/kiss-mod/depends
deleted file mode 100644
index 50cdb74..0000000
--- a/ports/unofficial/stable/kiss-mod/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-axel
-git
diff --git a/ports/unofficial/stable/kiss-mod/sources b/ports/unofficial/stable/kiss-mod/sources
deleted file mode 100644
index 22f3912..0000000
--- a/ports/unofficial/stable/kiss-mod/sources
+++ /dev/null
@@ -1,3 +0,0 @@
-https://github.com/kiss-community/kiss/archive/5.3.2.tar.gz
-https://github.com/kiss-community/website/archive/5fc67c946d2391827273ef3f35ca55ca657f7ea7.tar.gz docs
-https://github.com/kiss-community/wiki/archive/a7fc18204756dba2f8c5ea1c782d57ec4acdfe49.tar.gz wiki
diff --git a/ports/unofficial/stable/kiss-mod/version b/ports/unofficial/stable/kiss-mod/version
deleted file mode 100644
index d18c7f9..0000000
--- a/ports/unofficial/stable/kiss-mod/version
+++ /dev/null
@@ -1 +0,0 @@
-5.3.0 1