diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index b1cf2f42d..71acceb7a 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=17
 _PICOLISP_MONTH=1
-_PICOLISP_DAY=23
+_PICOLISP_DAY=30
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 # We use our bintray mirror since old version snapshots are not kept on main site.
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=35f9264c9665d4247033e8d86f7fc31285621aee08009f77691e065c629c3ffd
+TERMUX_PKG_SHA256=5f4a03881cfab786d71f853536aca8e728949f8c6ed674a8f4440c35b6f88e57
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):
@@ -15,6 +15,12 @@ TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
 if [ $TERMUX_ARCH_BITS = 32 ]; then
 	# "Variable length array in structure won't be supported"
 	TERMUX_PKG_CLANG=no
+else
+	# FIXME: Use gcc for linking, as a clang build causes (tzo),
+	# the time zone offset, to return 0:
+	# Also, this call hangs:
+	# (call "termux-notification" "--title" "Title" "--content" "Message")
+	TERMUX_PKG_CLANG=no
 fi
 
 termux_step_pre_configure() {
@@ -47,10 +53,15 @@ termux_step_make_install () {
 	cd $TERMUX_PKG_SRCDIR/
 
 	if [ $TERMUX_ARCH_BITS = "64" ]; then
-		$CC -fno-integrated-as -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
+		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s
+		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
+		$TERMUX_HOST_PLATFORM-as -o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
+
+		$CC -o ../bin/picolisp ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.o \
+			-Wl,--no-as-needed -rdynamic -lc -lm -ldl -pie
 		chmod +x ../bin/picolisp
-		$CC -fno-integrated-as -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
-		$CC -fno-integrated-as -pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
+		$CC -o ../lib/ext -shared -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.o
+		$CC -o ../lib/ht -shared -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.o
 	fi
 
 	mkdir -p $TERMUX_PREFIX/share/man/man1