diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py
index dd6ff29663..e6eb85fce4 100644
--- a/var/spack/repos/builtin/packages/htop/package.py
+++ b/var/spack/repos/builtin/packages/htop/package.py
@@ -9,15 +9,21 @@
 class Htop(AutotoolsPackage):
     """htop is an interactive text-mode process viewer for Unix systems."""
 
-    homepage = "https://github.com/hishamhm/htop"
-    url      = "https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz"
-    list_url = "https://hisham.hm/htop/releases"
-    list_depth = 1
+    homepage = "https://github.com/htop-dev/htop/"
+    url      = "https://github.com/htop-dev/htop/archive/refs/tags/3.1.1.tar.gz"
+    maintainers = ['sethrj']
 
-    version('2.2.0', sha256='d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57')
-    version('2.0.2', sha256='179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487')
+    version('3.1.1', sha256='b52280ad05a535ec632fbcd47e8e2c40a9376a9ddbd7caa00b38b9d6bb87ced6')
+    version('3.0.5', sha256='4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c')
+    version('2.2.0', sha256='d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57', url='https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz')
+    version('2.0.2', sha256='179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487', url='https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz')
 
     depends_on('ncurses')
+    depends_on('ncurses@6:', when='@3:')
+
+    depends_on('autoconf', type='build', when='@3:')
+    depends_on('automake', type='build', when='@3:')
+    depends_on('libtool', type='build', when='@3:')
     depends_on('python+pythoncmd', type='build')
 
     def configure_args(self):