diff --git xbps-clean/configure xbps-workdir/configure
index 8e6b2db..7079ab8 100755
--- xbps-clean/configure
+++ xbps-workdir/configure
@@ -3,6 +3,8 @@
 
 VERSION=0.60
 
+alias pkg-config=${ASTRAL_XBPS_PKG_CONFIG}
+
 # Ensure that we do not inherit these from env
 OS=
 BUILD=
diff --git xbps-clean/lib/fetch/ftp.c xbps-workdir/lib/fetch/ftp.c
index 877b70d..a303d18 100644
--- xbps-clean/lib/fetch/ftp.c
+++ xbps-workdir/lib/fetch/ftp.c
@@ -138,7 +138,7 @@ unmappedaddr(struct sockaddr_in6 *sin6, socklen_t *len)
 	sin4->sin_port = port;
 	sin4->sin_family = AF_INET;
 	*len = sizeof(struct sockaddr_in);
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__astral__)
 	sin4->sin_len = sizeof(struct sockaddr_in);
 #endif
 }