diff --git a/gnu/usr.bin/egcs/libgcc/Makefile b/gnu/usr.bin/egcs/libgcc/Makefile
index 049dd9b836c2..12e73dcbd32a 100644
--- a/gnu/usr.bin/egcs/libgcc/Makefile
+++ b/gnu/usr.bin/egcs/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 1998/04/01 21:13:25 tv Exp $
+#	$NetBSD: Makefile,v 1.4 1998/04/01 22:34:33 tv Exp $
 
 .PATH: ${.CURDIR}/../../../dist/gcc/cp ${.CURDIR}/../../../dist/gcc/cp/inc
 LIB=	gcc
@@ -24,8 +24,10 @@ LIB2OBJS+=__gcc_bcmp.o _varargs.o _eprintf.o _op_new.o _new_handler.o \
 	  _op_delete.o _bb.o _shtab.o _clear_cache.o _trampoline.o __main.o \
 	  _exit.o _ctors.o _op_vdel.o _op_vnew.o _pure.o __dummy.o
 
+HAVE_GCC28!= $(CXX) --version | egrep "^(2\.8|egcs)" ; echo 
+
 # Extra code to include in libgcc2 for C++ support.
-.if !defined(EGCS_BOOTSTRAP)
+.if !defined(EGCS_BOOTSTRAP) && ${HAVE_GCC28} != ""
 SRCS+=		tinfo.cc tinfo2.cc new.cc new1.cc new2.cc exception.cc
 CXXFLAGS+=	-I$(DIST)/cp/inc
 LIB2OBJS+=	_eh.o
@@ -57,4 +59,10 @@ ${LIB2OBJS}: libgcc2.c
 ${LIB2SOBJS}: libgcc2.c
 	${COMPILE.c} -fpic -DL${.PREFIX} -o ${.TARGET} ${DIST}/libgcc2.c
 
+afterinstall:
+	@if [ ! -f ${.OBJDIR}/_eh.o ]; then\
+		echo '***** You should rebuild and reinstall libgcc.a using the new egcs'; \
+		echo '***** compiler in order to include all the necessary C++ support.'; \
+	fi
+
 .include <bsd.lib.mk>