diff --git a/devel/nextpnr-devel/Makefile b/devel/nextpnr-devel/Makefile
index 0b84fdf46ae0..d952d6346518 100644
--- a/devel/nextpnr-devel/Makefile
+++ b/devel/nextpnr-devel/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	nextpnr
-PORTVERSION=	g20250208
+PORTVERSION=	g20250210
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	jbo@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
 
 BUILD_DEPENDS=	${LOCALBASE}/share/trellis/database:devel/trellis \
-		${LOCALBASE}/share/icebox:devel/icestorm
+		${LOCALBASE}/share/icebox:devel/icestorm \
+		${LOCALBASE}/share/prjpeppercorn:devel/prjpeppercorn111
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs
 
 USES=		compiler:c++17-lang cmake llvm:min=20 qt:6 eigen:3 python
 USE_QT=		base
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
 GH_TUPLE=	YosysHQ:nextpnr-tests:ce15412:tests/tests
-GH_TAGNAME=	35f14336c042a9aa86cc66221434262fbb02034e
+GH_TAGNAME=	2a8bab976d04745355800e9f23db6a7d208ce81c
 
 CONFLICTS_INSTALL=	nextpnr
 
+PORTSCOUT=	ignore:1
+
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
-CMAKE_ARGS=	-DARCH="ice40;ecp5" \
+CMAKE_ARGS=	-DARCH="ice40;ecp5;himbaechel" \
+		-DHIMBAECHEL_UARCH="gatemate" \
+		-DHIMBAECHEL_PEPPERCORN_PATH=${LOCALBASE}/share/prjpeppercorn \
 		-DTRELLIS_ROOT=${LOCALBASE}/share/trellis/
-CMAKE_OFF=	BUILD_GUI
-
-PLIST_FILES=	bin/nextpnr-ecp5 \
-		bin/nextpnr-ice40
+CMAKE_ON=	BUILD_GUI
 
 # Don't create __pycache__ directory when executing blueprint-compiler
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV=	PYTHONDONTWRITEBYTECODE=1
 
 .if exists(/usr/include/omp.h)
 CMAKE_ON+=	USE_OPENMP
 .else
 CMAKE_OFF+=	USE_OPENMP
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/nextpnr-devel/distinfo b/devel/nextpnr-devel/distinfo
index 9afb2dada4eb..474a7fa42e3a 100644
--- a/devel/nextpnr-devel/distinfo
+++ b/devel/nextpnr-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1770687926
-SHA256 (YosysHQ-nextpnr-g20250208-35f14336c042a9aa86cc66221434262fbb02034e_GH0.tar.gz) = f7abc513680079306c333b5c01979cab5f645bdb4fa3b95b9449496e7673913d
-SIZE (YosysHQ-nextpnr-g20250208-35f14336c042a9aa86cc66221434262fbb02034e_GH0.tar.gz) = 3491676
+TIMESTAMP = 1770767347
+SHA256 (YosysHQ-nextpnr-g20250210-2a8bab976d04745355800e9f23db6a7d208ce81c_GH0.tar.gz) = dd5516a100cbc8a03de0c897111338a185059ee446fc12f10bbf34ce6b0700ac
+SIZE (YosysHQ-nextpnr-g20250210-2a8bab976d04745355800e9f23db6a7d208ce81c_GH0.tar.gz) = 3492050
 SHA256 (YosysHQ-nextpnr-tests-ce15412_GH0.tar.gz) = 84b7e926d97ce1aae3a2b9115b9030fce483a8b6d8b6cde060046a93f24966fe
 SIZE (YosysHQ-nextpnr-tests-ce15412_GH0.tar.gz) = 1032708
diff --git a/devel/nextpnr-devel/pkg-plist b/devel/nextpnr-devel/pkg-plist
new file mode 100644
index 000000000000..16d7e63b54ee
--- /dev/null
+++ b/devel/nextpnr-devel/pkg-plist
@@ -0,0 +1,5 @@
+bin/nextpnr-ecp5
+bin/nextpnr-ice40
+bin/nextpnr-himbaechel
+%%DATADIR%%/himbaechel/gatemate/chipdb-CCGM1A1.bin
+%%DATADIR%%/himbaechel/gatemate/chipdb-CCGM1A2.bin