diff --git a/astro/py-astropy-healpix/Makefile b/astro/py-astropy-healpix/Makefile
index 88912ebf3e9a..bad185c4a61d 100644
--- a/astro/py-astropy-healpix/Makefile
+++ b/astro/py-astropy-healpix/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	astropy-healpix
-PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	HEALPix algorithm for Astropy
 WWW=		https://astropy-healpix.readthedocs.io/en/latest/ \
 		https://github.com/astropy/astropy-healpix
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extension-helpers>0:astro/py-extension-helpers@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \
-		${PY_SETUPTOOLS} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extension-helpers>=1.3:astro/py-extension-helpers@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=5:astro/py-astropy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
+		${PY_SETUPTOOLS}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=6.1:astro/py-astropy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0,1:math/py-numpy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-astropy>0:astro/py-pytest-astropy@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	distutils autoplist pytest
+USE_PYTHON=	pep517 autoplist pytest
+
+CFLAGS+=	-std=gnu11
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/astropy_healpix/tests
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:S/-/_/}/_core.*.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:S/-/_/}/compiler_version.*.so
 
 # tests fail to run, see https://github.com/astropy/astropy-healpix/issues/272
 
 .include <bsd.port.mk>
diff --git a/astro/py-astropy-healpix/distinfo b/astro/py-astropy-healpix/distinfo
index adbdecd25cbe..ed10446fd2e6 100644
--- a/astro/py-astropy-healpix/distinfo
+++ b/astro/py-astropy-healpix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1768884404
-SHA256 (astropy_healpix-1.1.3.tar.gz) = f520d83abe8215d3e8e1a37b2bd91171ee36a6f55f110d5a2db863d75d81b3b7
-SIZE (astropy_healpix-1.1.3.tar.gz) = 109331
+TIMESTAMP = 1783414793
+SHA256 (astropy_healpix-2.0.0.tar.gz) = 6ce7646dc5b1c09a7ed24b1f23d3e2fce8e3570387220d26a24487ab001b3b0b
+SIZE (astropy_healpix-2.0.0.tar.gz) = 112064
diff --git a/astro/py-astropy-healpix/files/patch-astropy__healpix___core.c b/astro/py-astropy-healpix/files/patch-astropy__healpix___core.c
new file mode 100644
index 000000000000..e697fbc2897d
--- /dev/null
+++ b/astro/py-astropy-healpix/files/patch-astropy__healpix___core.c
@@ -0,0 +1,13 @@
+-- workaround for https://github.com/astropy/astropy-healpix/issues/321
+
+--- astropy_healpix/_core.c.orig	2026-07-07 20:08:05 UTC
++++ astropy_healpix/_core.c
+@@ -310,7 +310,7 @@ static void bit_scan_reverse_loop(
+         int64_t  in = *(int64_t *) &args[0][i * steps[0]];
+         int    *out =  (int *)     &args[1][i * steps[1]];
+         #if __has_include(<stdbit.h>)
+-            *out = 63 - stdc_leading_zeros(in);
++            *out = 63 - stdc_leading_zeros((unsigned long long)in);
+         #elif defined(_MSC_VER)
+             unsigned long index;
+             if (_BitScanReverse64(&index, in))
diff --git a/astro/py-astropy-healpix/files/patch-pyproject.toml b/astro/py-astropy-healpix/files/patch-pyproject.toml
new file mode 100644
index 000000000000..6dbad15d40bd
--- /dev/null
+++ b/astro/py-astropy-healpix/files/patch-pyproject.toml
@@ -0,0 +1,10 @@
+--- pyproject.toml.orig	2026-07-07 09:01:45 UTC
++++ pyproject.toml
+@@ -1,6 +1,6 @@
+ [build-system]
+ 
+-requires = ["setuptools>=77.0.1",
++requires = ["setuptools>=63.1.0",
+             "setuptools_scm",
+             "extension-helpers>=1.3,<2",
+             "numpy>=2.0.0"]