diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index bc36b5322856..66e15f3be363 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,78 +1,79 @@
 # Created by: bart <lbartoletti@FreeBSD.org>
 
 PORTNAME=	pdal
 DISTVERSION=	2.3.0
 PORTREVISION=	3
 CATEGORIES=	math databases graphics
+MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgeotiff.so:graphics/libgeotiff \
 		libxml2.so:textproc/libxml2 \
 		liblaszip.so:archivers/laszip \
 		libzstd.so:archivers/zstd \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
-USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl
+USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl tar:bz2
 USE_LDCONFIG=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:tu}
-GH_PROJECT=	${GH_ACCOUNT}
+
+WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src
 
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 CMAKE_OFF=	WITH_TESTS
 
 OPTIONS_DEFINE=	BASH \
 		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
 
 OPTIONS_DEFAULT=	BASH \
 			ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO
 
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
 BASH_DESC=		BASH completion
 ICEBRIDGE_DESC=		Enable Icebridge plugin
 LAZPERF_DESC=		Enable LAZPerf plugin
 MBIO_DESC=		Enable MBIO plugin
 PGPOINTCLOUD_DESC=	Enable Coherent PostgreSQL Point Cloud plugin
 
 BASH_CMAKE_BOOL=	WITH_COMPLETION
 BASH_RUN_DEPENDS=	bash:shells/bash
 
 ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/szip
 
 LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
 LAZPERF_LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
 
 PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
 PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/pdal/distinfo b/math/pdal/distinfo
index 31571bee8e5e..bd67b9de02d1 100644
--- a/math/pdal/distinfo
+++ b/math/pdal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622878834
-SHA256 (PDAL-PDAL-2.3.0_GH0.tar.gz) = 8ae848e9b3fe5149a9277fe60e10b9858edb9a3cf1a40728f11712498e5da13a
-SIZE (PDAL-PDAL-2.3.0_GH0.tar.gz) = 113434573
+TIMESTAMP = 1642399942
+SHA256 (pdal-2.3.0-src.tar.bz2) = 63d8d4fee491675f0fa3dca58c26d57fb2afcaa37c24b10f595b3fbff174996e
+SIZE (pdal-2.3.0-src.tar.bz2) = 107560748