diff --git a/deskutils/hebcal/Makefile b/deskutils/hebcal/Makefile
index 4eabe703836a..288bc1a71bc8 100644
--- a/deskutils/hebcal/Makefile
+++ b/deskutils/hebcal/Makefile
@@ -11,9 +11,9 @@ 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
@@ -26,8 +26,6 @@ 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
@@ -36,7 +34,6 @@ 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."
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
@@ -4,4 +4,6 @@ bin/elmoconf.pl
 %%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%%