diff --git a/devel/tex-kpathsea/Makefile b/devel/tex-kpathsea/Makefile
index 5ad4e06d47b3..e773bd30406e 100644
--- a/devel/tex-kpathsea/Makefile
+++ b/devel/tex-kpathsea/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Path searching library for TeX
 
 USE_XZ=		yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 USE_TEX=	texlive
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES}
@@ -23,8 +23,5 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/texk/kpathsea
 GNU_CONFIGURE=	yes
 
 INFO=	kpathsea
-MAN1=	kpseaccess.1 kpsereadlink.1 kpsestat.1 kpsewhich.1 mktexlsr.1 \
-	mktexmf.1 mktexpk.1 mktextfm.1 texhash.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/tex-kpathsea/pkg-plist b/devel/tex-kpathsea/pkg-plist
index 2d3f89c1effb..1180b36611b5 100644
--- a/devel/tex-kpathsea/pkg-plist
+++ b/devel/tex-kpathsea/pkg-plist
@@ -52,6 +52,15 @@ include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/version.h
 include/kpathsea/win32lib.h
+man/man1/kpseaccess.1.gz
+man/man1/kpsereadlink.1.gz
+man/man1/kpsestat.1.gz
+man/man1/kpsewhich.1.gz
+man/man1/mktexlsr.1.gz
+man/man1/mktexmf.1.gz
+man/man1/mktexpk.1.gz
+man/man1/mktextfm.1.gz
+man/man1/texhash.1.gz
 @dirrm include/kpathsea
 lib/libkpathsea.a
 lib/libkpathsea.la
diff --git a/lang/mosh/Makefile b/lang/mosh/Makefile
index b885beb45dda..81362ba6c735 100644
--- a/lang/mosh/Makefile
+++ b/lang/mosh/Makefile
@@ -23,9 +23,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS_INSTALL=	mosh-1.[0-9].*
 
 PROJECTHOST=	mosh-scheme
-MAN1=	mosh.1 mosh_config.1
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff --git a/lang/mosh/pkg-plist b/lang/mosh/pkg-plist
index ce6f528f35ff..4ff6918d8e50 100644
--- a/lang/mosh/pkg-plist
+++ b/lang/mosh/pkg-plist
@@ -283,6 +283,8 @@ lib/mosh/lib/yuni/util/messages.sls
 lib/mosh/lib/yuni/util/tables.sls
 lib/mosh/lib/yuni/util/tables/internal.sls
 lib/mosh/lib/yuni/util/tables/scheme.sls
+man/man1/mosh.1.gz
+man/man1/mosh_config.1.gz
 @dirrm lib/mosh/lib/yuni/util/tables
 @dirrm lib/mosh/lib/yuni/util
 @dirrm lib/mosh/lib/yuni/ui/terminal