diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 2172af1dbe72..ccebf9fd186a 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,18 +1,21 @@
 PORTNAME=	bvi
 DISTVERSION=	1.4.2
 PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF
-EXTRACT_SUFX=	.src.tar.gz
+DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Vi-like binary file (hex)editor
 WWW=		https://bvi.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		ncurses
+
 GNU_CONFIGURE=	yes
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
 .include <bsd.port.mk>