diff --git a/comms/jerm/Makefile b/comms/jerm/Makefile
index a4826ee8a46b..8389f96d3ad3 100644
--- a/comms/jerm/Makefile
+++ b/comms/jerm/Makefile
@@ -9,23 +9,16 @@ MASTER_SITES=	http://www.bsddiary.net/jerm/
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	Communication terminal through serial and TCP/IP interfaces
 
-MAN1=		jerm.1
-
-OPTIONS_DEFINE=	JUPITER
+OPTIONS_DEFINE=	DOCS JUPITER
 
 JUPITER_DESC=	With Jupiter support
 
+OPTIONS_SUB=	yes
+
 PORTDOCS=	README
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MJUPITER}
-PLIST_SUB+=	WITH_JUPITER=""
-.else
-PLIST_SUB+=	WITH_JUPITER="@comment "
-.endif
-
 .if ! ${PORT_OPTIONS:MJUPITER}
 MAKE_ARGS+=	JUPITER_FLAGS=
 .endif
@@ -33,19 +26,21 @@ MAKE_ARGS+=	JUPITER_FLAGS=
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|' \
 		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|sys/termios.h|termios.h|' \
+		${WRKSRC}/tiocdtr.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jerm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tiocdtr ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/jerm.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/jerm ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/tiocdtr ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/jerm.1 ${STAGEDIR}${PREFIX}/man/man1/
+
 .if ${PORT_OPTIONS:MJUPITER}
-	@${MKDIR} ${PREFIX}/libexec/jerm
-	${INSTALL_SCRIPT} ${WRKSRC}/init.sh ${PREFIX}/libexec/jerm
-	${INSTALL_SCRIPT} ${WRKSRC}/rock.pl ${PREFIX}/libexec/jerm
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/jerm
+	${INSTALL_SCRIPT} ${WRKSRC}/init.sh ${STAGEDIR}${PREFIX}/libexec/jerm/
+	${INSTALL_SCRIPT} ${WRKSRC}/rock.pl ${STAGEDIR}${PREFIX}/libexec/jerm/
 .endif
 
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/comms/jerm/pkg-plist b/comms/jerm/pkg-plist
index d5c31f0f2b0a..04e85495f4e5 100644
--- a/comms/jerm/pkg-plist
+++ b/comms/jerm/pkg-plist
@@ -1,5 +1,6 @@
 bin/jerm
 bin/tiocdtr
-%%WITH_JUPITER%%libexec/jerm/init.sh
-%%WITH_JUPITER%%libexec/jerm/rock.pl
-%%WITH_JUPITER%%@dirrm libexec/jerm
+%%JUPITER%%libexec/jerm/init.sh
+%%JUPITER%%libexec/jerm/rock.pl
+man/man1/jerm.1.gz
+%%JUPITER%%@dirrm libexec/jerm