diff --git a/devel/Makefile b/devel/Makefile
index 5486d72349d03..6e9c1a3ea53ac 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -741,14 +741,7 @@
     SUBDIR += gcli
     SUBDIR += gconf2
     SUBDIR += gconfmm26
-#
-# devel/gdb is replaced by devel/gdb-meta that points at devel/gdb-cheri on
-# CheriBSD.
-#
-# Do not build devel/gdb but leave it in CheriBSD ports to prevent possible
-# upstream merge issues.
-#
-#    SUBDIR += gdb
+    SUBDIR += gdb
     SUBDIR += gdb-cheri
     SUBDIR += gdb-meta
     SUBDIR += gdcm
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index a09f58936bf21..a240d14e679db 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,6 @@
 .ifndef SLAVE_PORT
+IGNORE=		is replaced by devel/gdb-meta on CheriBSD
+
 PORTNAME=	gdb
 DISTVERSION=	13.1
 PORTREVISION=	3