diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec
index da60b61965..6bef4040a7 100644
--- a/anda/langs/nim/choosenim/choosenim.spec
+++ b/anda/langs/nim/choosenim/choosenim.spec
@@ -1,11 +1,17 @@
+%global nimver %(curl -sSL https://nim-lang.org/channels/stable | xargs)
+
 Name:			choosenim
-Version:		0.8.4
+Version:		0.8.9
 Release:		1%?dist
 Summary:		Easily install and manage multiple versions of the Nim programming language
 License:		BSD-3-Clause
-URL:			https://github.com/dom96/choosenim
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-BuildRequires:	nim git
+URL:			https://github.com/nim-lang/choosenim
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+Source1:        https://nim-lang.org/download/nim-%nimver-linux_x64.tar.xz
+Packager:		madonuko <mado@fyralabs.com>
+BuildRequires:	git-core anda-srpm-macros
+BuildConflicts: nim nim-tools
+#BuildRequires:  nim nim-tools
 
 %description
 choosenim installs the Nim programming language from official downloads and
@@ -13,10 +19,12 @@ sources, enabling you to easily switch between stable and development compilers.
 
 %prep
 %autosetup
+tar -xvJf %SOURCE1
 
 %build
-nimble setup -y
-nim c -t:-fPIE -l:-pie -d:release -t:"$CFLAGS" -l:"$LDFLAGS" src/choosenim
+NIMPATH=`pwd`/nim-%nimver/bin
+PATH=$PATH:$NIMPATH
+%nim_c src/choosenim
 
 %install
 install -Dm755 src/choosenim %buildroot%_bindir/choosenim
diff --git a/anda/langs/nim/choosenim/update.rhai b/anda/langs/nim/choosenim/update.rhai
index 06b3e87387..6cc4e85559 100644
--- a/anda/langs/nim/choosenim/update.rhai
+++ b/anda/langs/nim/choosenim/update.rhai
@@ -1 +1 @@
-rpm.version(gh("dom96/choosenim"));
+rpm.version(gh("nim-lang/choosenim"));