diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index b9b76bfc1f22..63f083d7990f 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gdb
 PORTVERSION=	7.3.1
 PORTREVISION=	3
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	gdb
 PKGNAMEPREFIX=	avr-
 DISTNAME=	gdb-${PORTVERSION}
@@ -13,17 +13,17 @@ DISTNAME=	gdb-${PORTVERSION}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	GNU GDB for the AVR target
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_BZIP2=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=avr --program-prefix=avr --disable-nls
 
-NO_STAGE=	yes
 pre-configure:
 	cd ${WRKSRC} ; ${RM} -rf dejagnu expect tcl texinfo
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
-		${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME}
+		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.mk>