diff --git a/shells/ambit/Makefile b/shells/ambit/Makefile
index 49c079f7e856..d3e79632f5e5 100644
--- a/shells/ambit/Makefile
+++ b/shells/ambit/Makefile
@@ -16,14 +16,11 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 AMBITDIR?=	/var/spool/${PORTNAME}
-MAN1=		${PORTNAME}.1
-MANCOMPRESSED=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB=	AMBITDIR=${AMBITDIR}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s!/bin/bash!${LOCALBASE}/bin/bash!" \
@@ -32,13 +29,10 @@ post-patch:
 		-e "s!/var/.MyNameIs!${AMBITDIR}!" ${WRKSRC}/usr/bin/ambit
 
 do-install:
-	@${MKDIR} ${AMBITDIR}/hosts
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/ambit ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/ambit/libambit.sh ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/${PORTNAME}.1.gz ${MANPREFIX}/man/man1
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
-	 ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \
-	fi
+	@${MKDIR} ${STAGEDIR}${AMBITDIR}/hosts
+	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/ambit ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/ambit/libambit.sh ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/${PORTNAME}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/shells/ambit/pkg-plist b/shells/ambit/pkg-plist
index 485d4ee9496e..febd64c9aabc 100644
--- a/shells/ambit/pkg-plist
+++ b/shells/ambit/pkg-plist
@@ -1,5 +1,6 @@
 bin/ambit
 lib/libambit.sh
+man/man1/ambit.1.gz
 @unexec if cmp -s %D/etc/ambit.conf.sample %D/etc/ambit.conf; then rm -f %D/etc/ambit.conf; fi
 etc/ambit.conf.sample
 @exec if [ ! -f %D/etc/ambit.conf ] ; then cp -p %D/%F %B/ambit.conf; fi