diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 545e64c088c..5f407f32aed 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2003/10/19 20:51:43 sturm Exp $
+# $OpenBSD: Makefile,v 1.9 2003/12/29 13:17:53 espie Exp $
 
 COMMENT=	"MPEG2 and MPEG-4 AAC decoder"
 
@@ -32,6 +32,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 PATCH_LIST=	patch-* gcc-*
 .endif
 
+.include <bsd.own.mk>
+USE_GCC3?=No
+.if ${USE_GCC3:L} == "yes"
+MAKE_FLAGS+=libmp4v2_la_LIBADD=-lsupc++
+.endif
+
 post-patch:
 	@cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		PATH=${PORTPATH} sh bootstrap