diff --git a/multimedia/dvb-apps/Makefile b/multimedia/dvb-apps/Makefile
index 7240c0299d5e..250a96c8c445 100644
--- a/multimedia/dvb-apps/Makefile
+++ b/multimedia/dvb-apps/Makefile
@@ -16,14 +16,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/version.h:multimedia/v4l_compat \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv localbase:ldflags perl5 tar:bzip2
 
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 MAKE_ARGS+=	prefix="${PREFIX}"
-CFLAGS+=	-I${LOCALBASE}/include -Wno-int-conversion
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/include|${LOCALBASE}/include|' \
@@ -49,5 +47,9 @@ post-patch:
 		${WRKSRC}/test/test_vevent.c \
 		${WRKSRC}/test/test_stillimage.c \
 		${WRKSRC}/test/test_av.c
+.if exists(/usr/lib/libstdc++.so)
+	@${REINPLACE_CMD} -e 's/-Wno-packed-bitfield-compat//' \
+		${WRKSRC}/util/scan/Makefile
+.endif
 
 .include <bsd.port.mk>