diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile
index cd92addda8d8..d834f12d10d2 100644
--- a/sysutils/ipfs-go/Makefile
+++ b/sysutils/ipfs-go/Makefile
@@ -1,49 +1,45 @@
 PORTNAME=	ipfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.0
-PORTREVISION=	6
+DISTVERSION=	0.18.1
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-go
-DISTNAME=	go-ipfs-source
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	IPFS implementation in Go
-WWW=		https://github.com/ipfs/go-ipfs
+WWW=		https://github.com/ipfs/kubo
 
 LICENSE=	MIT APACHE20
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 
-USES=		cpe go:1.18,modules
+USES=		cpe go:1.19,modules
 
 CPE_VENDOR=	protocol
 
+GO_MODULE=	github.com/ipfs/kubo
 GO_TARGET=	./cmd/ipfs:ipfs-go
 
-NO_WRKSUBDIR=	yes
-
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES=	${FULLNAME}
 SUB_LIST=	IPFS_USER=${IPFS_USER} \
 		IPFS_GROUP=${IPFS_GROUP} \
 		IPFS_HOME=${IPFS_HOME}
 PLIST_SUB=	IPFS_USER=${IPFS_USER} \
 		IPFS_GROUP=${IPFS_GROUP} \
 		IPFS_HOME=${IPFS_HOME}
 
 IPFS_USER?=	${FULLNAME}
 IPFS_GROUP?=	${FULLNAME}
 IPFS_HOME?=	/var/db/${FULLNAME}
 
 USERS=		${IPFS_USER}
 GROUPS=		${IPFS_GROUP}
 
 FULLNAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${IPFS_HOME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ipfs-go/distinfo b/sysutils/ipfs-go/distinfo
index 571adecf01ba..9173f1b40a7c 100644
--- a/sysutils/ipfs-go/distinfo
+++ b/sysutils/ipfs-go/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1655490739
-SHA256 (go-ipfs-source.tar.gz) = 784207b26b43def178f115451c4cf6f20915bfbbb9d2930113c67ea1a33aa4b3
-SIZE (go-ipfs-source.tar.gz) = 13474994
+TIMESTAMP = 1675430958
+SHA256 (go/sysutils_ipfs-go/ipfs-v0.18.1/v0.18.1.mod) = 507eee7a17fab434e6a5c7f193448a08d6e3683d5adc5a3746ae4e295da279fe
+SIZE (go/sysutils_ipfs-go/ipfs-v0.18.1/v0.18.1.mod) = 11884
+SHA256 (go/sysutils_ipfs-go/ipfs-v0.18.1/v0.18.1.zip) = 7d8cb5b6ce18253f87f7fa678a2f0f9c0ae3a95ca125965598c2b914d4f44beb
+SIZE (go/sysutils_ipfs-go/ipfs-v0.18.1/v0.18.1.zip) = 2416507
diff --git a/sysutils/ipfs-go/files/patch-repo_fsrepo_migrations_fetcher.go b/sysutils/ipfs-go/files/patch-repo_fsrepo_migrations_fetcher.go
index 435283e0f570..c25d6e318889 100644
--- a/sysutils/ipfs-go/files/patch-repo_fsrepo_migrations_fetcher.go
+++ b/sysutils/ipfs-go/files/patch-repo_fsrepo_migrations_fetcher.go
@@ -1,11 +1,11 @@
---- repo/fsrepo/migrations/fetcher.go.orig	2022-06-17 18:33:52 UTC
+--- repo/fsrepo/migrations/fetcher.go.orig	1979-11-30 05:00:00 UTC
 +++ repo/fsrepo/migrations/fetcher.go
-@@ -11,7 +11,7 @@ const (
+@@ -11,7 +11,7 @@ import (
  
  const (
  	// Current distribution to fetch migrations from
--	CurrentIpfsDist = "/ipfs/QmdaCHYBDHEhXCMoynH5UcohEay6m1XayZCcxWZzKAHNVN" // fs-repo-11-to-12 v1.0.2
-+	CurrentIpfsDist = "" // fs-repo-11-to-12 v1.0.2
+-	CurrentIpfsDist = "/ipfs/Qmf4yftD4LuMo8JMNPqqw3BtUwYd2VkXMiAThuPE6usrbQ" // fs-repo-12-to-13 v1.0.0
++	CurrentIpfsDist = "" // fs-repo-12-to-13 v1.0.0
  	// Latest distribution path.  Default for fetchers.
- 	LatestIpfsDist = "/ipns/dist.ipfs.io"
+ 	LatestIpfsDist = "/ipns/dist.ipfs.tech"