diff --git a/misc/dtach/Makefile b/misc/dtach/Makefile
index 1129a83a0cbf..7c474ac10f98 100644
--- a/misc/dtach/Makefile
+++ b/misc/dtach/Makefile
@@ -1,11 +1,11 @@
 # Created by: Bjorn Lindstrom <bkhl@elektrubadur.se>
 # $FreeBSD$
 
-PORTNAME=		dtach
-PORTVERSION=		0.8
-PORTREVISION=		1
-CATEGORIES=		misc
-MASTER_SITES=		SF
+PORTNAME=	dtach
+PORTVERSION=	0.8
+PORTREVISION=	1
+CATEGORIES=	misc
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emulates the detach feature of screen
@@ -13,23 +13,17 @@ COMMENT=	Emulates the detach feature of screen
 GNU_CONFIGURE=	yes
 ALL_TARGET=	dtach
 
-MAN1=		dtach.1
 PORTDOCS=	README
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/dtach man/man1/dtach.1.gz
 
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS 
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/dtach ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/dtach.1 ${MAN1PREFIX}/man/man1/
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/dtach ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dtach.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>