diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile
index 20d1f3e717d0..bbc78a5d8ac0 100644
--- a/devel/mspdebug/Makefile
+++ b/devel/mspdebug/Makefile
@@ -1,26 +1,23 @@
 # Created by: Peter Jeremy <peterjeremy@acm.org>
 # $FreeBSD$
 
-# Based on the OpenBSD port by:		Jasper Lievisse Adriaanse <jasper@openbsd.org>
+PORTNAME=	mspdebug
+PORTVERSION=	0.21
+CATEGORIES=	devel
+MASTER_SITES=	SF/${PORTNAME}
 
-PORTNAME=		mspdebug
-PORTVERSION=		0.21
-CATEGORIES=		devel
-MASTER_SITES=		SF/${PORTNAME}
+MAINTAINER=	peterjeremy@acm.org
+COMMENT=	Debugger for use with MSP 430 MCUs
 
-MAINTAINER=		peterjeremy@acm.org
-COMMENT=		Debugger for use with MSP 430 MCUs
+LICENSE=	GPLv2
 
-LICENSE=		GPLv2
+USES=		gmake
 
-MAN1=			mspdebug.1
-USE_GMAKE=		yes
+PLIST_FILES=	bin/mspdebug man/man1/mspdebug.1.gz
 
-PLIST_FILES=		bin/mspdebug
-
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mspdebug ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mspdebug.man ${PREFIX}/man/man1/mspdebug.1
+	${INSTALL_PROGRAM} ${WRKSRC}/mspdebug ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mspdebug.man \
+		${STAGEDIR}${MANPREFIX}/man/man1/mspdebug.1
 
 .include <bsd.port.mk>