diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 1d9ccd814cfd..158d85d3a9b9 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -14,4 +14,7 @@ SRCS+=	hash.cc getopt.c getopt1.c
 
 CXXFLAGS+=	-I${GPROFDIR}/lib -I${.CURDIR}
 
+DPADD+=	${LIBSTDCPLUSPLUS}
+LDADD+=	-lstdc++
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 771bc1e85427..a44334e02249 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grodvi
 SRCS=		dvi.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 6b67f9811266..411a229c2de4 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		post-grohtml
 SRCS=		post-html.cc html-text.cc output.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 NOMAN=		YES
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 304e3adfe4dc..376305a8e7ac 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grolbp
 SRCS=		lbp.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index 52a43f87b319..1d923a312980 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grolj4
 SRCS=		lj4.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 3e8c2557956a..23707b765ca0 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grops
 SRCS=		ps.cc psrm.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index 1c4fd81b1269..f46c64f26e7f 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grotty
 SRCS=		tty.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 217c3056b18f..e2895ab4490c 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -5,8 +5,8 @@ SRCS=		eqn.cc eqn_tab.h main.cc lex.cc \
 		box.cc limit.cc list.cc over.cc text.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF}
-LDADD=		${LIBGROFF}
+DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lstdc++
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
 CLEANFILES=	eqn.cc eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 8192e8df7af8..6bd1577bde37 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		grn
 SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
-DPADD=	 	${LIBGROFF} ${LIBM}
-LDADD=	 	${LIBGROFF} -lm
+DPADD=	 	${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=	 	${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 0cf0783556b5..828a8d515659 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		pre-grohtml
 SRCS=		pre-html.cc pushbackbuffer.cc
-DPADD=		${LIBGROFF}
-LDADD=		${LIBGROFF}
+DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lstdc++
 NOMAN=		YES
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 36a3b7e06ac5..3d420dd46c36 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -4,8 +4,8 @@ PROG=		pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
 		common.cc troff.cc tex.cc
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN} pic.cc pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cc
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index ac3799bcbc3b..2c64462ba54e 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -3,8 +3,8 @@
 PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
 CFLAGS+=	-I${DIST_DIR}
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	label.cc label_tab.h ${MAN} y.tab.c y.tab.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index d625af58466c..35d725dd6a78 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		tbl
 SRCS=		main.cc table.cc
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 97eb90413dcd..58fa439c06bc 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		groff
 SRCS=		groff.cc pipeline.c
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 6ce2b9712e16..37cd4b150120 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -3,8 +3,8 @@
 PROG=		troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
 		number.cc majorminor.cc
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	majorminor.cc ${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 44d2b62a89ac..1debf3faffd3 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		addftinfo
 SRCS=		addftinfo.cc guess.cc
-DPADD=		${LIBGROFF}
-LDADD=		${LIBGROFF}
+DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 7d50e48153a1..2b7d9ac2363c 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		hpftodit
 SRCS=		hpftodit.cc
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index 91e0a72d003e..ba0fd18c0823 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		indxbib
 SRCS=		indxbib.cc signal.c
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 beforeinstall:
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 7d59bf0e1f83..18be042c835a 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		lkbib
 SRCS=		lkbib.cc
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 50fb79687cd7..7b010c56e79e 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		lookbib
 SRCS=		lookbib.cc
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index 34788714e89f..b242378b89a7 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -2,8 +2,8 @@
 
 PROG=		tfmtodit
 SRCS=		tfmtodit.cc
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
+LDADD=		${LIBGROFF} -lm -lstdc++
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>