diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile
index 7dea1c4bc744..81f35b7cbb43 100644
--- a/textproc/miller/Makefile
+++ b/textproc/miller/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	miller
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.10.2
-PORTREVISION=	1
+DISTVERSION=	6.13.0
 CATEGORIES=	textproc
+MASTER_SITES=	https://raw.githubusercontent.com/johnkerl/${PORTNAME}/${DISTVERSIONFULL}/:gomod
+DISTFILES=	go.mod:gomod
 
 MAINTAINER=	jungleboogie0+mlr@gmail.com
 COMMENT=	Sed/awk/cut/join/sort for name-indexed data such as CSV, TSV and JSON
 WWW=		https://johnkerl.org/miller/doc/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		autoreconf cpe libtool
+USES=		cpe go:modules
 CPE_VENDOR=	johnkerl
+GO_MODULE=	github.com/johnkerl/miller
+GO_TARGET=	./cmd/mlr
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	johnkerl
 
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-TEST_TARGET=	check
-
-PLIST_FILES=	bin/mlr share/man/man1/mlr.1.gz
+PLIST_FILES=	bin/mlr
 
 .include <bsd.port.mk>
diff --git a/textproc/miller/distinfo b/textproc/miller/distinfo
index 89edc6868390..733355cd66a1 100644
--- a/textproc/miller/distinfo
+++ b/textproc/miller/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1617723090
-SHA256 (johnkerl-miller-v5.10.2_GH0.tar.gz) = b6026479ee7315656d7ec228d0084f86d4cecc5b8b00d5400f5fb3600af65eb3
-SIZE (johnkerl-miller-v5.10.2_GH0.tar.gz) = 6192382
+TIMESTAMP = 1742033027
+SHA256 (go/textproc_miller/johnkerl-miller-v6.13.0_GH0/go.mod) = 4bb233f6406867848cef758a5dc7ad2fbcdcfca053ae424bb6da123e9d5cd1f6
+SIZE (go/textproc_miller/johnkerl-miller-v6.13.0_GH0/go.mod) = 1325
+SHA256 (go/textproc_miller/johnkerl-miller-v6.13.0_GH0/johnkerl-miller-v6.13.0_GH0.tar.gz) = 6beca48af3066fc8d87c3ce17c5dd3debac61ff8f296c0e95c0634fd3ab05599
+SIZE (go/textproc_miller/johnkerl-miller-v6.13.0_GH0/johnkerl-miller-v6.13.0_GH0.tar.gz) = 11082724