diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index bfb32444c6d0..5efcb0850864 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-USES=		gettext gmake pathfix pkgconfig libtool
+USES=		gettext gmake pathfix pkgconfig libtool makeinfo
 USE_GNOME=	gnomeprefix libgnomeui
 USE_XORG=	xbitmaps x11
 INSTALL_TARGET=	install-strip
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 469bc5e8557b..e115e1d1e477 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Big Brother Database
 
 USE_EMACS=	yes
 
+USES=		makeinfo
 ALL_TARGET=	bbdb info
 MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"makeinfo --no-split\""
 BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 85e303dfcba1..79c36d2a6f6b 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -10,10 +10,9 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU Gregorian calendar program
 
-USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-USES=		shebangfix
+USES=		shebangfix makeinfo tar:xz
 SHEBANG_FILES=	misc/gcalltx/gcalltxp.in misc/gcalltx/gcalltx.pl
 
 INFO=		gcal
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index cf83dbe4286c..d823f388ecc8 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
 USE_AUTOTOOLS=	autoconf:env
 BUILD_VERSION=	1.14
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-USES=		perl5 tar:xz
+USES=		makeinfo perl5 tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 692275fdf5a0..c81644f74f68 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
 USE_AUTOTOOLS=	autoconf:env
 BUILD_VERSION=	1.4
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-USES=		perl5
+USES=		makeinfo perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile
index a8cb7a344ac0..558dcfac30d1 100644
--- a/devel/cutils/Makefile
+++ b/devel/cutils/Makefile
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.sigala.it/sandro/files/
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Miscellaneous C programmer's utilities
 
+USES=		makeinfo
 GNU_CONFIGURE=	yes
 MAKE_ENV=	MAKEINFO=makeinfo
 INFO=		cutils
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index bf92dfd9686b..9615e070c532 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -12,6 +12,7 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	Collection of useful routines for Emacs lisp programs
 
+USES=		makeinfo
 # setupel filename
 PORT_SETUPEL=	elib-startup.el
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index d9632756bd24..1ed0c4784ca4 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-prefix=g
 
-USES=		tar:bzip2
+USES=		makeinfo tar:bzip2
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index 67832819f7d3..4aaec48ccf26 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="makeinfo --no-split"
 USE_LDCONFIG=	yes
-USES=		libtool pathfix
+USES=		libtool makeinfo pathfix
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 81367afa75e5..fcbf0de5fab4 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -16,6 +16,7 @@ LICENSE?=        GPLv2
 
 CONFLICTS=	libtool-fixed-[0-9]*
 
+USES=		makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --disable-ltdl-install
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 2444f80ab678..0288e5c7d955 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU m4
 
-USES=		tar:bzip2
+USES=		makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 8c00c5484602..9ed82ba6e2f9 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -25,8 +25,7 @@ SSP_UNSAFE=	yes
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
 USE_LDCONFIG=	yes
-USES=		bison iconv gmake perl5
-USE_BZIP2=	yes
+USES=		bison iconv gmake makeinfo perl5 tar:bzip2
 USE_PERL5=	build
 
 GCC_TARG=	${PKGNAMEPREFIX:S/-$//}
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index ee79f878d925..c84715141bea 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libbotan-1.10.so:${PORTSDIR}/security/botan110
 
 SUB_FILES=	pkg-message
-USES=		iconv pkgconfig gmake perl5 lua:51 tar:bzip2
+USES=		iconv pkgconfig gmake perl5 lua:51 tar:bzip2 makeinfo
 USE_PERL5=	build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 8d83ecf49904..afb812140e94 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -16,6 +16,8 @@ LICENSE=	GPLv2
 
 PORTCLASS?=	master
 
+USES=		makeinfo
+
 # distfile version
 FLIM_VER=	${FLIM_TRUNK}.9
 FLIM_TRUNK=	1.14
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index aa633c7cb998..d1a1063a4eda 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -13,6 +13,8 @@ COMMENT?=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
+USES=		makeinfo
+
 PORTCLASS?=	master
 
 # distfile version
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9a180b9ee9f4..5abcf5b7be1b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 
-USES=		iconv:patch pkgconfig gmake
+USES=		iconv:patch pkgconfig gmake makeinfo
 USE_XORG=	xpm ice sm xext xv xt x11 xmu
 USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
 GNU_CONFIGURE=	yes
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index ec2481998aab..df99c00a9d9a 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -31,7 +31,7 @@ SOUNDSRC=	${WRKDIR}/${SOUNDISTNAME}
 MUSICSRC=	${WRKDIR}/${MUSICDISTNAME}
 
 USE_SDL=	mixer sdl
-USES=		gettext gmake iconv
+USES=		gettext gmake iconv makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index de7898ccd8e7..f0fdc955a358 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	X11
 
-USES=		libtool:keepla ncurses
+USES=		libtool:keepla ncurses makeinfo
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index a968d57d4ca5..a80e57b8aa21 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 RUN_DEPENDS=	OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
 
 USE_AUTOTOOLS=	automake:env autoconf:env
-USES=		gmake compiler:features 
+USES=		gmake compiler:features makeinfo
 # We need a newer version of makeinfo for this.
 # Remove this line when we remove texinfo from the base system.
 CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 2a18813a92a7..04c4f8850589 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc410/Makefile b/lang/gcc410/Makefile
index 8a96df5cd037..06fb73880b69 100644
--- a/lang/gcc410/Makefile
+++ b/lang/gcc410/Makefile
@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv perl5 tar:bzip2 makeinfo
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 343a6f336f05..c2533d58f303 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 322227cec071..029c0a0f7782 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -33,7 +33,7 @@ DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index ce894fa5bfc5..870e12efd4c0 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 4128e2607aa5..9d67f61a17fa 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -32,7 +32,7 @@ DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5 tar:bzip2
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 5ecbc40750e8..dd6459605d1f 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	exim
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Documentation for the Exim MTA in multiple formats
 
-USE_BZIP2=	yes
+USES=		makeinfo tar:bzip2
 NO_STAGE=	yes
 
 DOCFORMAT?=	html
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 88f398521d09..b03b2af9b3e8 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -16,8 +16,7 @@ LICENSE=	LGPL3
 OPTIONS_DEFINE=	CPU_OPTS
 CPU_OPTS_DESC=	Enable assembly optimizations for your CPU
 
-USES=		libtool:keepla
-USE_XZ=		yes
+USES=		libtool:keepla makeinfo tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index b7402e829c56..5699ea132f57 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -11,6 +11,7 @@ COMMENT=	The GNU Scientific Library - mathematical libs
 
 LICENSE=	GPLv3
 
+USES=		makeinfo
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	MAKEINFO='makeinfo --no-split'
diff --git a/math/mingw32-libgmp/Makefile b/math/mingw32-libgmp/Makefile
index 15bd45ee6400..e5b2f83cf201 100644
--- a/math/mingw32-libgmp/Makefile
+++ b/math/mingw32-libgmp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library for arbitrary precision arithmetic (MinGW32)
 BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
 		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
 
-USE_BZIP2=	yes
+USES=		makeinfo tar:bzip2
 GMP_TARG=	${PKGNAMEPREFIX:S/-$//}
 GNU_CONFIGURE=	yes
 CC=		${PKGNAMEPREFIX}gcc
diff --git a/science/netcdf-fortran/Makefile b/science/netcdf-fortran/Makefile
index 7e951d1314dd..3e74e894ba28 100644
--- a/science/netcdf-fortran/Makefile
+++ b/science/netcdf-fortran/Makefile
@@ -15,6 +15,7 @@ LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 
 CONFLICTS=	netcdf-ftn-[0-9]* netcdf3-ftn-[0-9]*
 
+USES=		makeinfo
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC -DPIC -DgFortran
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gnutls3/Makefile b/security/gnutls3/Makefile
index 0e4d6d707259..85f6b847be0c 100644
--- a/security/gnutls3/Makefile
+++ b/security/gnutls3/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
 
 GNUTLS_SUFFIX=	3
 
-USES=		gmake iconv libtool:keepla pkgconfig tar:xz
+USES=		gmake iconv libtool:keepla makeinfo pkgconfig tar:xz
 USE_LDCONFIG=	${PREFIX}/lib/gnutls3
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 2da7936a8bc2..62341418a87e 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
 
-USES=		libtool:oldver tar:bzip2
+USES=		libtool:oldver makeinfo tar:bzip2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 6d576d760cbf..f54cd0bf599f 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 
 USE_AUTOTOOLS=	libtool
 USE_PERL5=	build
-USES=		pathfix pkgconfig iconv perl5
+USES=		pathfix pkgconfig iconv perl5 makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-db-dir=/var/shishi
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 4e85f5e7660a..e6aa72c710ca 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -20,6 +20,8 @@ OPTIONS_DEFINE=	OPENLDAP DOCS
 OPTIONS_DEFAULT=OPENLDAP
 OPENLDAP_DESC=	OpenLDAP support
 
+USES=		makeinfo
+
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index e11d513720a4..d7665d5a1866 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
 		gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		bison gmake tar:bzip2
+USES=		bison gmake makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
 # install flex header to its own dir to avoid conflict with system flex.
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 33653279432b..2f7b9cbb6a35 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -13,7 +13,7 @@ COMMENT=	The GNU stream editor
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
 
-USES=		charsetfix gmake
+USES=		charsetfix makeinfo gmake
 PATCH_SUBDIRS=	. doc lib sed
 DATADIR=	${PREFIX}/share/${PKGBASE}
 SAMP_FILES=	binary*.sed dc.sed