diff --git a/deskutils/hebcal/Makefile b/deskutils/hebcal/Makefile
index 4eabe703836a..288bc1a71bc8 100644
--- a/deskutils/hebcal/Makefile
+++ b/deskutils/hebcal/Makefile
@@ -1,19 +1,19 @@
 # Created by: Edwin Groothuis
 # $FreeBSD$
 
 PORTNAME=	hebcal
 PORTVERSION=	3.7
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-c/${PORTVERSION}/
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Hebrew Calendar calculator
 
 HAS_CONFIGURE=	yes
 
-PLIST_FILES=	bin/hebcal
-MAN1=		hebcal.1
+PLIST_FILES=	bin/hebcal \
+		man/man1/hebcal.1.gz
+
 INFO=		hebcal
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 5066ee382e32..fbfca21fa022 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -1,53 +1,50 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	elmo
 PORTVERSION=	1.3.0
 PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Receive, filter, read, compose, and send mail at the text console
 
 CONFLICTS=	elmo-devel-[0-9]*
 
 OPTIONS_DEFINE=	NLS
 
 GNU_CONFIGURE=	yes
 USES=		iconv shebangfix perl5
 USE_OPENSSL=	yes
 USE_PERL5=	run
 SHEBANG_FILES=	src/elmoconf.pl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		elmo.1 elmoconf.pl.1
-
 NLS_CONFIGURE_ON=	--with-libintl-prefix="${LOCALBASE}"
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=	gettext
 OPTIONS_SUB=	yes
 
 .if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
 LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
 .else
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_CMD}
 	@${ECHO_CMD} "Define WITH_GPGME=yes to build with gpgme support."
 	@${ECHO_CMD}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' -e 's|== "|= "|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' ${WRKSRC}/src/pgp.c
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/elmo/pkg-plist b/mail/elmo/pkg-plist
index 738bf6a0b551..2f240ffb0bc2 100644
--- a/mail/elmo/pkg-plist
+++ b/mail/elmo/pkg-plist
@@ -1,7 +1,9 @@
 bin/elmo
 bin/elmoconf.pl
 %%DATADIR%%/template
 %%DATADIR%%/tutorial
 %%NLS%%share/locale/de/LC_MESSAGES/elmo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
+man/man1/elmo.1.gz
+man/man1/elmoconf.pl.1.gz
 @dirrm %%DATADIR%%