diff --git a/8bc/COMMIT_MSG b/8bc/COMMIT_MSG
new file mode 100644
index 0000000000..579f0b90b0
--- /dev/null
+++ b/8bc/COMMIT_MSG
@@ -0,0 +1,5 @@
+lang/8bc: Add 8bc version 2
+
+8bc is a B compiler for the PDP-8.  It compiles standard B for the
+PDP-8/E or later computers with or without an EAE.  Programs are
+compiled to BIN formatted tapes with an entry point at 0200.
diff --git a/8bc/DESCR b/8bc/DESCR
new file mode 100644
index 0000000000..9b7fe0034d
--- /dev/null
+++ b/8bc/DESCR
@@ -0,0 +1,3 @@
+8bc is a B compiler for the PDP-8.  It compiles standard B for the
+PDP-8/E or later computers with or without an EAE.  Programs are
+compiled to BIN formatted tapes with an entry point at 0200.
diff --git a/8bc/LICENSE.pdp8pal b/8bc/LICENSE.pdp8pal
new file mode 100644
index 0000000000..cea640a70c
--- /dev/null
+++ b/8bc/LICENSE.pdp8pal
@@ -0,0 +1,12 @@
+Authors:
+  Douglas Jones <jones@cs.uiowa.edu>  -- built basic bits
+  Rich Coon <coon@convexw.convex.com> -- added enough handle OS/278
+  Bernhard Baehr <b.baehr@madsack.de> -- patch to correct checksum
+
+Copyright Notice:
+  I wrote this and gave it away for free; if you want to make changes
+  and give away the result for free, that's fine with me.  If you can
+  fix it enough that you can sell it, ok, but don't put any limits on
+  the purchaser's right to do the same.  All the above aside, if you
+  improve it or fix any bugs, it would be nice if you told me and
+  offered me a copy of the new version.
diff --git a/8bc/Makefile b/8bc/Makefile
new file mode 100644
index 0000000000..822895c4ba
--- /dev/null
+++ b/8bc/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD$
+
+DISTNAME=	version_${PKGVERSION_NOREV}
+PKGNAME=	8bc-2
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GITHUB:=clausecker/}
+GITHUB_TAG=	${DISTNAME}
+DIST_SUBDIR=	${PKGBASE}
+
+MAINTAINER=	mdehling@gmail.com
+HOMEPAGE=	https://github.com/clausecker/8bc/
+COMMENT=	B compiler for the PDP-8
+#LICENSE=	2-clause-bsd AND pdp8pal-license
+
+TOOL_DEPENDS+=	groff-[0-9]*:../../textproc/groff
+
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+
+USE_TOOLS+=	gmake sed patch nroff groff lex yacc
+TOOLS_PATH.groff=	${PREFIX}/bin/groff
+
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	P=${DESTDIR}
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/8bc/PLIST b/8bc/PLIST
new file mode 100644
index 0000000000..bb8f585f8e
--- /dev/null
+++ b/8bc/PLIST
@@ -0,0 +1,18 @@
+@comment $NetBSD$
+bin/8bc
+bin/pal
+libexec/8bc1
+man/man1/8bc.1
+man/man1/pal.1
+share/8bc/brt.pal
+share/doc/8bc/8bc.pdf
+share/doc/8bc/8bc.txt
+share/examples/8bc/dump.b
+share/examples/8bc/echo.b
+share/examples/8bc/fibonacci.b
+share/examples/8bc/gcd.b
+share/examples/8bc/hello.b
+share/examples/8bc/multiply.b
+share/examples/8bc/numbers.b
+share/examples/8bc/sort.b
+share/examples/8bc/words.b
diff --git a/8bc/distinfo b/8bc/distinfo
new file mode 100644
index 0000000000..67866c4097
--- /dev/null
+++ b/8bc/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+BLAKE2s (8bc/version_2.tar.gz) = c97fe274635600552f7dbed401443c0ca5b191816465f85ba609a77e4cb21afb
+SHA512 (8bc/version_2.tar.gz) = 1bc072c4d16ce11d1801abb8b004fbf6f309fc926192de92dc21f4558eb93aaa01d284471082044863e00915022e3a88f4c334b750e6515940d7c30f6354c0ab
+Size (8bc/version_2.tar.gz) = 53049 bytes
+SHA1 (patch-doc_8bc.ms) = ab0caef025b6731f507bc6b33799699e4d9f9888
diff --git a/8bc/patches/patch-doc_8bc.ms b/8bc/patches/patch-doc_8bc.ms
new file mode 100644
index 0000000000..43978f3934
--- /dev/null
+++ b/8bc/patches/patch-doc_8bc.ms
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix incorrect case in roff macro.
+
+--- doc/8bc.ms.orig	2024-03-07 20:00:18.657790530 +0000
++++ doc/8bc.ms
+@@ -751,7 +751,7 @@ instructions, statically known skips are
+ AC to 0 or 1 followed by
+ .CW SZA
+ or
+-.Cw SNA
++.CW SNA
+ are merged into one.
+ .PP
+ Summarised, the following optimisations are performed:
diff --git a/Makefile b/Makefile
index aa94f48053..f1787eaf00 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ SUBDIR+=	2048-c
 SUBDIR+=	3dsconv
 SUBDIR+=	4ti2
 SUBDIR+=	7z-bin
+SUBDIR+=	8bc
 SUBDIR+=	8cc-git
 SUBDIR+=	ARC
 SUBDIR+=	Aseprite