diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index bdce2f3ee35..67c24541aa6 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/07/25 22:23:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2004/11/21 18:01:03 espie Exp $
 
 COMMENT=	"enhanced performance test of filesystem I/O"
 
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m stdc++
 
 NO_REGRESS=	Yes
 USE_GMAKE=      Yes
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index bfe21e84aef..e10ebf7f3af 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2003/09/30 10:25:34 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2004/11/21 18:01:03 espie Exp $
 # Uses pthreads
 
 COMMENT=	"performance test of sequential file I/O"
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	"incomplete/bad license"
 PERMIT_PACKAGE_FTP=	"incomplete/bad license"
 PERMIT_DISTFILES_CDROM=	"incomplete/bad license"
 PERMIT_DISTFILES_FTP=	"incomplete/bad license"
+WANTLIB=		c pthread
 
 MAKE_ENV=	CC="${CC}"
 
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 0c4b212a199..1396c56c90b 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2002/10/24 22:46:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2004/11/21 18:01:03 espie Exp $
 
 COMMENT=	"system performance measurement"
 DISTNAME=	lmbench
@@ -10,6 +10,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 # this is the new home site
 #
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index 0232ac1a152..7ac63aee610 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/07/23 18:29:52 jakob Exp $
+# $OpenBSD: Makefile,v 1.20 2004/11/21 18:01:03 espie Exp $
 
 COMMENT=	"Network performance benchmark"
 
@@ -7,8 +7,9 @@ CATEGORIES=	benchmarks net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
 
-MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ \
-		ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/archive/ \
+#MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ \
+#		ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/archive/ \
+MASTER_SITES= \
 		http://ftp.sunet.se/pub/network/monitoring/netperf/ \
 		http://ftp.sunet.se/pub/network/monitoring/netperf/archive/
 
@@ -18,6 +19,7 @@ PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m
 
 MAKE_FILE=	makefile
 MAKE_FLAGS+=	CC="${CC}" CFLAGS='-O -DDEBUG_LOG_FILE="\"/tmp/netperf.debug\"" -DUSE_LOOPER -DDO_DNS'
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index a1f818c6bcf..a7468658d03 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/06/03 10:25:00 xsa Exp $
+# $OpenBSD: Makefile,v 1.18 2004/11/21 18:01:03 espie Exp $
 # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
 
 COMMENT=	"self-scaling network benchmark"
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 MASTER_SITES=	${HOMEPAGE}/code/
 
diff --git a/benchmarks/netstrain/Makefile b/benchmarks/netstrain/Makefile
index 5d9ffbba09c..fb625e9909a 100644
--- a/benchmarks/netstrain/Makefile
+++ b/benchmarks/netstrain/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/05/22 19:54:10 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/11/21 18:01:04 espie Exp $
 
 COMMENT=	"tool to measure TCP throughput"
 DISTNAME=	netstrain-3.0
@@ -12,6 +12,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
+WANTLIB=		c
 
 NO_REGRESS=	Yes
 
diff --git a/benchmarks/randread/Makefile b/benchmarks/randread/Makefile
index 321ca747838..f19e0b3a108 100644
--- a/benchmarks/randread/Makefile
+++ b/benchmarks/randread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/30 08:39:48 xsa Exp $
+# $OpenBSD: Makefile,v 1.3 2004/11/21 18:01:04 espie Exp $
 
 COMMENT=	"help benchmark random read performance"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 NO_REGRESS=	Yes
 
diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile
index f4416b2805a..48b38982291 100644
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2003/08/02 00:56:56 jolan Exp $
+# $OpenBSD: Makefile,v 1.18 2004/11/21 18:01:04 espie Exp $
 
 COMMENT=	"measure the throughput of a TCP connection"
 
@@ -11,6 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 FAKE_FLAGS=	BINDIR="${PREFIX}/bin" DESTDIR="${WRKINST}" 
 
diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index 97450a2fc89..abe38fbea6a 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/30 08:39:48 xsa Exp $
+# $OpenBSD: Makefile,v 1.3 2004/11/21 18:01:04 espie Exp $
 
 COMMENT=	"Unix benchmark utility"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m
 
 CONFIGURE_STYLE=	simple	
 
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 0187f40c869..38b561c2f57 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2002/10/24 22:46:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2004/11/21 18:01:04 espie Exp $
 
 COMMENT=	"reciprocating engine for X11"
 PKGNAME=	xengine-1.0.1
@@ -12,6 +12,7 @@ PERMIT_PACKAGE_CDROM=	"no fee"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xpm Xt c m
 
 DIST_SUBDIR=	xengine
 EXTRACT_CASES=	*.z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_PERL_FIX_SHAR} | /bin/sh;;