diff --git a/audio/gonic/Makefile b/audio/gonic/Makefile
index bc50717cdd42..dc114d6bd123 100644
--- a/audio/gonic/Makefile
+++ b/audio/gonic/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	gonic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.2
-PORTREVISION=	2
+DISTVERSION=	0.16.1
 CATEGORIES=	audio net
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Music streaming server / subsonic server API implementation
 WWW=		https://github.com/sentriz/gonic
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libtag.so:audio/taglib
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		mpv:multimedia/mpv
 
-USES=		go:modules pkgconfig sqlite
+USES=		go:modules,1.21 pkgconfig sqlite
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	go.senan.xyz/gonic
 GO_TARGET=	./cmd/gonic
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_FILES=	bin/gonic
 
 .include <bsd.port.mk>
diff --git a/audio/gonic/distinfo b/audio/gonic/distinfo
index 40b11dfe4348..6936819e9723 100644
--- a/audio/gonic/distinfo
+++ b/audio/gonic/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1686175235
-SHA256 (go/audio_gonic/gonic-v0.15.2/v0.15.2.mod) = 36827e3efac39ff4dd818ee85e1320105bb6bdec38dfe2b1cbfcb10698ddda4d
-SIZE (go/audio_gonic/gonic-v0.15.2/v0.15.2.mod) = 2670
-SHA256 (go/audio_gonic/gonic-v0.15.2/v0.15.2.zip) = e982c9cbd3f1a94747aa88745ab9af7ea524bd13c113eae8aa55d70eb1e60ec1
-SIZE (go/audio_gonic/gonic-v0.15.2/v0.15.2.zip) = 1656682
+TIMESTAMP = 1699952178
+SHA256 (go/audio_gonic/gonic-v0.16.1/v0.16.1.mod) = f80fe35f14dfec59d0fe2e62092da81670fa0b98437ed6edd54c17a517fb4156
+SIZE (go/audio_gonic/gonic-v0.16.1/v0.16.1.mod) = 2908
+SHA256 (go/audio_gonic/gonic-v0.16.1/v0.16.1.zip) = 7dcbd1704688486bdf694a0a1faa1287d740b22903b6a3f5595a27e5df29e114
+SIZE (go/audio_gonic/gonic-v0.16.1/v0.16.1.zip) = 2059696
diff --git a/audio/gonic/files/gonic.in b/audio/gonic/files/gonic.in
index 154f544c447d..c028c471ee93 100644
--- a/audio/gonic/files/gonic.in
+++ b/audio/gonic/files/gonic.in
@@ -1,40 +1,41 @@
 #!/bin/sh
 
 # PROVIDE: gonic
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name=gonic
 rcvar=${name}_enable
 desc="Music streaming server"
 
 load_rc_config "${name}"
 
 # other variables:
 # gonic_scan_interval
 # gonic_music_path
 # gonic_podcast_path
+# gonic_playlists_path
 
 : ${gonic_enable:="NO"}
 : ${gonic_user:="gonic"}
 : ${gonic_group:="gonic"}
 : ${gonic_proxy_prefix:="/"}
 : ${gonic_db_path:="/var/db/gonic/gonic.db"}
 : ${gonic_listen_addr:="0.0.0.0:4747"}
 : ${gonic_cache_path:="/var/cache/gonic"}
 
 pidfile=/var/run/gonic.pid
 procname="%%PREFIX%%/bin/gonic"
 command="/usr/sbin/daemon"
-command_args="-cf -p ${pidfile} ${procname} ${gonic_music_path:+-music-path=${gonic_music_path}} ${gonic_podcast_path:+-podcast-path=${gonic_podcast_path}} ${gonic_cache_path:+-cache-path=${gonic_cache_path}} ${gonic_proxy_prefix:+-proxy-prefix=${gonic_proxy_prefix}} ${gonic_listen_addr:+-listen-addr=${gonic_listen_addr}} ${gonic_scan_interval:+-scan-interval=${gonic_scan_interval}} ${gonic_db_path:+-db-path=${gonic_db_path}} ${gonic_args}"
+command_args="-cf -p ${pidfile} ${procname} ${gonic_music_path:+-music-path=${gonic_music_path}} ${gonic_podcast_path:+-podcast-path=${gonic_podcast_path}} ${gonic_playlists_path:+-playlists-path=${gonic_playlists_path}} ${gonic_cache_path:+-cache-path=${gonic_cache_path}} ${gonic_proxy_prefix:+-proxy-prefix=${gonic_proxy_prefix}} ${gonic_listen_addr:+-listen-addr=${gonic_listen_addr}} ${gonic_scan_interval:+-scan-interval=${gonic_scan_interval}} ${gonic_db_path:+-db-path=${gonic_db_path}} ${gonic_args}"
 
 gonic_startprecmd()
 {
 	if [ ! -e ${pidfile} ]; then
 		install -o ${gonic_user} -g ${gonic_group} /dev/null ${pidfile};
 	fi
 }
 start_precmd=gonic_startprecmd
 run_rc_command "$1"
diff --git a/audio/gonic/files/patch-scanner_scanner.go b/audio/gonic/files/patch-scanner_scanner.go
deleted file mode 100644
index e56bf3eaac2a..000000000000
--- a/audio/gonic/files/patch-scanner_scanner.go
+++ /dev/null
@@ -1,14 +0,0 @@
---- scanner/scanner.go.orig	2023-06-07 22:14:47 UTC
-+++ scanner/scanner.go
-@@ -635,9 +635,9 @@ func statCreateTime(info fs.FileInfo) time.Time {
- 	if !ok {
- 		return time.Time{}
- 	}
--	if stat.Ctim.Sec == 0 {
-+	if stat.Ctimespec.Sec == 0 {
- 		return time.Time{}
- 	}
- 	//nolint:unconvert // Ctim.Sec/Nsec is int32 on arm/386, etc
--	return time.Unix(int64(stat.Ctim.Sec), int64(stat.Ctim.Nsec))
-+	return time.Unix(int64(stat.Ctimespec.Sec), int64(stat.Ctimespec.Nsec))
- }