diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile
index d61ca0ed4a17..47656e5ce5cc 100644
--- a/www/xcaddy/Makefile
+++ b/www/xcaddy/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	xcaddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.0
-PORTREVISION=	3
+DISTVERSION=	0.3.1
+PORTREVISION=	0
 CATEGORIES=	www
 DIST_SUBDIR=	xcaddy
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Command line tool to make custom builds of the Caddy Web Server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	caddyserver
-GH_TUPLE=	Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3
+GH_TUPLE=	Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
+		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex
 
 GO_TARGET=	./cmd/xcaddy
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/xcaddy/distinfo b/www/xcaddy/distinfo
index 73ccb9c4864d..50d5ba464266 100644
--- a/www/xcaddy/distinfo
+++ b/www/xcaddy/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1650010585
-SHA256 (xcaddy/caddyserver-xcaddy-v0.3.0_GH0.tar.gz) = 1a59ff6f51959072a512002e7ec280ea96775361277ba046a8af5a820a37aacd
-SIZE (xcaddy/caddyserver-xcaddy-v0.3.0_GH0.tar.gz) = 22104
+TIMESTAMP = 1661544234
+SHA256 (xcaddy/caddyserver-xcaddy-v0.3.1_GH0.tar.gz) = b99d989590724deac893859002c3fc573fb66b3606c1012c425ae563d0971440
+SIZE (xcaddy/caddyserver-xcaddy-v0.3.1_GH0.tar.gz) = 23152
 SHA256 (xcaddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f
 SIZE (xcaddy/Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506
+SHA256 (xcaddy/google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
+SIZE (xcaddy/google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342