diff --git a/anda/apps/neohtop/neohtop-cli/anda.hcl b/anda/apps/neohtop/neohtop-cli/anda.hcl
new file mode 100644
index 0000000000..c3c4347ee0
--- /dev/null
+++ b/anda/apps/neohtop/neohtop-cli/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "neohtop-cli.spec"
+    }
+}
diff --git a/anda/apps/neohtop/neohtop-cli/neohtop-cli.spec b/anda/apps/neohtop/neohtop-cli/neohtop-cli.spec
new file mode 100644
index 0000000000..0d461911b8
--- /dev/null
+++ b/anda/apps/neohtop/neohtop-cli/neohtop-cli.spec
@@ -0,0 +1,44 @@
+%define debug_package %{nil}
+
+%global goipath github.com/abdenasser/neohtop-cli
+Version:        0.1.12
+
+%gometa -f
+
+Name:           neohtop-cli
+Release:        1%{?dist}
+Summary:        A cross-platform terminal process monitor with btop-style visualizations
+License:        MIT
+URL:            https://github.com/Abdenasser/neohtop-cli
+Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
+Packager:       Owen Zimmerman <owen@fyralabs.com>
+BuildRequires:  go-rpm-macros
+
+%description
+%summary.
+
+%gopkg
+
+%prep
+%autosetup
+
+%build
+%define gomodulesmode GO111MODULE=on
+pushd cli
+%gobuild -o %{gobuilddir}/../neohtop-cli %{goipath}/
+popd
+
+%install
+install -Dm 0755 cli/neohtop-cli %{buildroot}%{_bindir}/neohtop-cli
+
+%files
+%doc README.md CONTRIBUTING.md
+%license LICENSE
+%{_bindir}/neohtop-cli
+
+%changelog
+* Sun Jun 14 2026 Owen Zimmerman <owen@fyralabs.com>
+- Use go packaging
+
+* Sun Mar 29 2026 Owen Zimmerman <owen@fyralabs.com>
+- Initial commit
diff --git a/anda/apps/neohtop/neohtop-cli/update.rhai b/anda/apps/neohtop/neohtop-cli/update.rhai
new file mode 100644
index 0000000000..5b959ea4b8
--- /dev/null
+++ b/anda/apps/neohtop/neohtop-cli/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("Abdenasser/neohtop-cli"));
diff --git a/anda/apps/neohtop/NeoHtop.desktop b/anda/apps/neohtop/neohtop/NeoHtop.desktop
similarity index 100%
rename from anda/apps/neohtop/NeoHtop.desktop
rename to anda/apps/neohtop/neohtop/NeoHtop.desktop
diff --git a/anda/apps/neohtop/anda.hcl b/anda/apps/neohtop/neohtop/anda.hcl
similarity index 100%
rename from anda/apps/neohtop/anda.hcl
rename to anda/apps/neohtop/neohtop/anda.hcl
diff --git a/anda/apps/neohtop/com.github.neohtop.metainfo.xml b/anda/apps/neohtop/neohtop/com.github.neohtop.metainfo.xml
similarity index 100%
rename from anda/apps/neohtop/com.github.neohtop.metainfo.xml
rename to anda/apps/neohtop/neohtop/com.github.neohtop.metainfo.xml
diff --git a/anda/apps/neohtop/neohtop.spec b/anda/apps/neohtop/neohtop/neohtop.spec
similarity index 100%
rename from anda/apps/neohtop/neohtop.spec
rename to anda/apps/neohtop/neohtop/neohtop.spec
diff --git a/anda/apps/neohtop/update.rhai b/anda/apps/neohtop/neohtop/update.rhai
similarity index 100%
rename from anda/apps/neohtop/update.rhai
rename to anda/apps/neohtop/neohtop/update.rhai