diff --git a/devel/nextpnr/Makefile b/devel/nextpnr/Makefile
index d3e46f4c6a80..3948b623cdd1 100644
--- a/devel/nextpnr/Makefile
+++ b/devel/nextpnr/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	nextpnr
-DISTVERSION=	g20200804
-PORTREVISION=	4
+DISTVERSION=	0.4
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	manu@FreeBSD.org
 COMMENT=	Portable FPGA place and route tool
 WWW=		https://github.com/YosysHQ/nextpnr
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	clang segfault
 BROKEN_FreeBSD_12_powerpc64=	runaway build
 
 BUILD_DEPENDS=	${LOCALBASE}/share/trellis/database:devel/trellis \
 		${LOCALBASE}/share/icebox:devel/icestorm
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
 		${PY_BOOST}
 
 USES=		compiler:c++11-lang cmake qt:5 eigen:3 python:3.5+ gl
 USE_QT=		buildtools:build core gui opengl qmake:build widgets
 USE_GL=		gl glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
-GH_TAGNAME=	48cd407
-GH_TUPLE=	YosysHQ:nextpnr-tests:8f93e7e:tests/tests
+GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
+GH_TUPLE=	YosysHQ:nextpnr-tests:00c55a9e:tests/tests
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 CMAKE_ARGS=	-DARCH="ice40;ecp5" -DTRELLIS_ROOT=${LOCALBASE}/share/trellis/
 
 PLIST_FILES=	bin/nextpnr-ecp5 \
 		bin/nextpnr-ice40
 
 .include <bsd.port.mk>
diff --git a/devel/nextpnr/distinfo b/devel/nextpnr/distinfo
index 7784b7e05e48..cb4eac6dc202 100644
--- a/devel/nextpnr/distinfo
+++ b/devel/nextpnr/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1599865678
-SHA256 (YosysHQ-nextpnr-g20200804-48cd407_GH0.tar.gz) = b82b29e2ab21dde73bfdcb59159671f18bec5b709052d02243501b0c2b6bbb9e
-SIZE (YosysHQ-nextpnr-g20200804-48cd407_GH0.tar.gz) = 3852966
-SHA256 (YosysHQ-nextpnr-tests-8f93e7e_GH0.tar.gz) = 5de9c0132957fcac6be6643a50499eb8d57402198b97ea20e684f9a0a10487a1
-SIZE (YosysHQ-nextpnr-tests-8f93e7e_GH0.tar.gz) = 1034317
+TIMESTAMP = 1671525390
+SHA256 (YosysHQ-nextpnr-0.4-nextpnr-0.4_GH0.tar.gz) = ae8e01496c3bb6607cef0e2501b8cf00aba564e9b116dd323887575ab82757c0
+SIZE (YosysHQ-nextpnr-0.4-nextpnr-0.4_GH0.tar.gz) = 4460419
+SHA256 (YosysHQ-nextpnr-tests-00c55a9e_GH0.tar.gz) = 2240aa0c61211a62ca307ef8d8b0f58c4ebb59ecb61334c45bf586daf69d964b
+SIZE (YosysHQ-nextpnr-tests-00c55a9e_GH0.tar.gz) = 1039171