diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 9b4db215cefc..1ba31dec7297 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,27 +1,28 @@
 # Created by: Samuel Tardieu <sam@rfc1149.net>
 # $FreeBSD$
 
 PORTNAME=	gputils
-PORTVERSION=	1.5.0
+DISTVERSION=	1.5.0-1
 CATEGORIES=	devel
-MASTER_SITES=	SF/gputils/gputils/${PORTVERSION}
+MASTER_SITES=	SF/gputils/gputils/${DISTVERSION:C/-.*//}
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Utilities for Microchip PIC microcontrollers
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	gplink-[0-9]*
 GNU_CONFIGURE=	yes
-USES=		bison gmake
 CONFIGURE_ARGS= --disable-dependency-tracking --disable-html-doc
+USES=		bison gmake tar:bz2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//}
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
 CONFIGURE_ARGS+=LEX=${LOCALBASE}/bin/flex
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo
index de5a0a372fbe..2eac4defeb84 100644
--- a/devel/gputils/distinfo
+++ b/devel/gputils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471779742
-SHA256 (gputils-1.5.0.tar.gz) = f6a517c186b991f504be5e4585316871d5950568257885d37487bb368dc76227
-SIZE (gputils-1.5.0.tar.gz) = 13155377
+TIMESTAMP = 1473752710
+SHA256 (gputils-1.5.0-1.tar.bz2) = 6f88a018e85717b57a22f27a0ca41b2157633a82351f7755be92e2d7dc40bb14
+SIZE (gputils-1.5.0-1.tar.bz2) = 6352391