diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 06eea6d260e227..821d6ede9a442b 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,32 +1,43 @@
 # Template file for 'choosenim'
 pkgname=choosenim
-version=0.8.4
+version=0.8.16
 revision=1
 create_wrksrc=yes
 hostmakedepends="git nim openssl-devel pkg-config"
-makedepends="openssl-devel zlib-devel libarchive-devel"
+makedepends="libcurl-devel openssl-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
-homepage="https://github.com/dom96/choosenim"
+homepage="https://github.com/nim-lang/choosenim"
 distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
- https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
- c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
+ https://github.com/nim-lang/nimble/archive/ed0b6ee.tar.gz>nimble-ed0b6ee.tar.gz
+ https://github.com/nim-lang/sat/archive/v0.1.0.tar.gz>sat-0.1.0.tar.gz
+ https://github.com/nim-lang/checksums/archive/v0.2.2.tar.gz>checksums-0.2.2.tar.gz
+ https://github.com/nim-lang/osinfo/archive/v0.3.2.tar.gz>osinfo-0.3.2.tar.gz
+ https://github.com/guzba/zippy/archive/0.10.19.tar.gz>zippy-0.10.19.tar.gz
+ https://github.com/Araq/libcurl/archive/v1.0.0.tar.gz>libcurl-1.0.0.tar.gz"
+checksum="b8549caa82bdc61025867262f11852ff948e0873f9ba27536b81e8473d5bc5e8
+ b948ec1c3eab28a3150286d9bcdadfa28d99347b23e11fa2af434e102a71143c
+ d5558cd419c8d46bdc958064cb97f963d1ea793866414c025906ec15033512ed
+ 47ae71311387724e9be50f43cb7350614c111ee4b5bacf97f698aa48bc1127a7
+ d5558cd419c8d46bdc958064cb97f963d1ea793866414c025906ec15033512ed
+ aa1e7c40fed6b64fa3a5d11533d5d1fd48ff99dfce93300a9e012d1a3a8ba80b
+ 6dc8401e8a8eabf9f0052ecd34b9f653e6b832c44a4451ab2fa7ded760949a41"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc-musl) broken="ftbfs" ;;
 esac
 
 post_extract() {
-	mv choosenim-$version/* .
-	mv nimarchive-0.5.4 nimarchive
+	mv choosenim-${version}/* .
 }
 
 do_build() {
 	local arch args
 	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=amd64;;
+		i686*)   arch=i386;;
 		aarch64*) arch=arm64;;
 		arm*)     arch=arm;;
 		mips*)    arch=mips;;
@@ -37,7 +48,6 @@ do_build() {
 		*)        msg_error "choosenim: $XBPS_TARGET_MACHINE unknown to template";;
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
-	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
 	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
@@ -55,9 +65,13 @@ do_build() {
 		EOF
 		args="--cpu:$arch"
 	fi
-	ln -sf $XBPS_CROSS_BASE/usr/include/archive.h src
-	ln -sf $XBPS_CROSS_BASE/usr/include/archive_entry.h src
-	nimble -y build -d:release --passC:-flto "$args" --path:$wrksrc/nimarchive
+	nimble -y build -d:release -d:ssl --passC:-flto "$args" \
+		--path:$wrksrc/nimble-ed0b6ee/src \
+		--path:$wrksrc/sat-0.1.0/src \
+		--path:$wrksrc/checksums-0.2.2/src \
+		--path:$wrksrc/osinfo-0.3.2/src \
+		--path:$wrksrc/zippy-0.10.19/src \
+		--path:$wrksrc/libcurl-1.0.0
 }
 
 do_install() {