diff --git a/py-astropy4/Makefile b/py-astropy4/Makefile
index ffe150b402..412b939504 100644
--- a/py-astropy4/Makefile
+++ b/py-astropy4/Makefile
@@ -1,11 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	astropy4-4.2
+DISTNAME=	astropy-4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GITHUB:=astropy/}
-GITHUB_PROJECT=	astropy
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+CATEGORIES=	math python
+MASTER_SITES=	${MASTER_SITE_PYPI:=a/astropy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.astropy.org/
@@ -15,7 +13,6 @@ LICENSE=	modified-bsd
 PYTHON_VERSIONS_INCOMPATIBLE+=	27
 PYTHON_VERSIONS_INCOMPATIBLE+=	36
 
-BUILD_DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 DEPENDS+=	libxml2>=2.9.10:../../textproc/libxml2
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.17.0:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-scipy>=1.1:../../wip/py-scipy
@@ -36,10 +33,6 @@ DEPENDS+=	${PYPKGPREFIX}-extension-helpers>=0.1:../../wip/py-extension-helpers
 DEPENDS+=	${PYPKGPREFIX}-jplephem>=2.15:../../wip/py-jplephem
 DEPENDS+=	${PYPKGPREFIX}-pyerfa>=1.7.1.1:../../wip/py-pyerfa
 
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	git init;
-
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-astropy4/PLIST b/py-astropy4/PLIST
index d665a020d6..b3cb685ce0 100644
--- a/py-astropy4/PLIST
+++ b/py-astropy4/PLIST
@@ -8,13 +8,13 @@ bin/samp_hub
 bin/showtable
 bin/volint
 bin/wcslint
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/astropy-0.1.dev0-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/astropy/CITATION
 ${PYSITELIB}/astropy/__init__.py
 ${PYSITELIB}/astropy/__init__.pyc
diff --git a/py-astropy4/distinfo b/py-astropy4/distinfo
index 1d1d3ad722..5722300eea 100644
--- a/py-astropy4/distinfo
+++ b/py-astropy4/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (astropy4-4.2.tar.gz) = 84acb108ebc22410e7af17bc64bacef72856086c
-RMD160 (astropy4-4.2.tar.gz) = 88572be3cd74340efa4645ddc5f40d224108edbd
-SHA512 (astropy4-4.2.tar.gz) = e2447862678128d51a23ae1e30888277d916c18ffba90295c2118b5397e28c4873565ed9daf5c97b2103156e8dc9e7d638b451ba6cdff3b6ba3c60e8b4e15eb6
-Size (astropy4-4.2.tar.gz) = 7361906 bytes
+SHA1 (astropy-4.2.tar.gz) = d103658b11fcc67de50e4b0422fdcac94aeb2f79
+RMD160 (astropy-4.2.tar.gz) = 2125f33572a4910bb16a78d42d2e10b98ac87eca
+SHA512 (astropy-4.2.tar.gz) = 14bb90aac13f3fe668114ebe578aac401987e8e2cd2bb9fb0971e5b8e9f8df6a594d454bb53e330807c3854c44d295e2b4dc96b57ccb69e5f53ee11356869d9d
+Size (astropy-4.2.tar.gz) = 7462293 bytes