diff --git a/Makefile.inc1 b/Makefile.inc1
index 9e17fa42fe66..5df999d6687c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -572,7 +572,11 @@ installmost:
 .if exists(${.CURDIR}/games) && !defined(NOGAMES)
 _strfile=	games/fortune/strfile
 .endif
+# This horrible kludge should be deleted in about 2 weeks, say July 9, 2002
+_cxx_version!=	${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}'
+.if ${CXX:T} != "c++" || ${_cxx_version} != "3.1" || exists(/usr/lib/libstdc++.so.4)
 _cxx_consumers=	gnu/usr.bin/gperf gnu/usr.bin/groff
+.endif
 
 bootstrap-tools:
 .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \