diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile
index 55fd21b769dd..8f370a9fecd1 100644
--- a/sysutils/ipfs-go/Makefile
+++ b/sysutils/ipfs-go/Makefile
@@ -3,10 +3,11 @@
 PORTNAME=	ipfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.17
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	LOCAL/yuri:gx
+MASTER_SITES=	https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-go
-DISTFILES=	${FULLNAME}-gx-${DISTVERSION}.tar.xz:gx
+DISTNAME=	go-ipfs-source
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	IPFS implementation in Go
@@ -16,11 +17,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
-USE_GITHUB=	yes
-GH_PROJECT=	go-ipfs
-GH_SUBDIR=	src/github.com/ipfs/go-ipfs
+GO_PKGNAME=	github.com/ipfs/go-ipfs
+GO_TARGET=	./cmd/ipfs
+
+NO_WRKSUBDIR=	yes
 
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
@@ -43,19 +45,9 @@ GROUPS=		${IPFS_GROUP}
 
 FULLNAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-post-patch:
-	@${RLN} ${WRKDIR}/gx ${WRKSRC}/src
-
-do-build:
-	# To update ipfs-go-gx-${DISTVERSION}.tar.xz deps bundle:
-	# comment out post-patch, run the command below, tar ${WRKSRC}/src/gx and re-upload .tar.xz
-	# cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} gx install
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build ./cmd/ipfs
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${IPFS_HOME}
 	@${MKDIR} ${STAGEDIR}${IPFS_LOGDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ipfs-go/distinfo b/sysutils/ipfs-go/distinfo
index e46db4c36ee6..600bd8daac24 100644
--- a/sysutils/ipfs-go/distinfo
+++ b/sysutils/ipfs-go/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1534183965
-SHA256 (ipfs-go-gx-0.4.17.tar.xz) = 7f9f233048b61416789ff8573ec4adddbccdc21557f135d998167f2c2b04144f
-SIZE (ipfs-go-gx-0.4.17.tar.xz) = 11255440
-SHA256 (ipfs-go-ipfs-v0.4.17_GH0.tar.gz) = 2562401bee0609d321bbf5e9c383de4124f634dcfd9394f1d23146a49f281718
-SIZE (ipfs-go-ipfs-v0.4.17_GH0.tar.gz) = 728972
+TIMESTAMP = 1535920571
+SHA256 (go-ipfs-source.tar.gz) = 4dce8bb71cdf11ed72731fb30db58ba6fbfcb78e73377171567fd6da846f1e93
+SIZE (go-ipfs-source.tar.gz) = 18659916