diff --git a/multimedia/mediamtx/Makefile b/multimedia/mediamtx/Makefile
index eb93bf953628..77f86d5fed00 100644
--- a/multimedia/mediamtx/Makefile
+++ b/multimedia/mediamtx/Makefile
@@ -1,36 +1,35 @@
 PORTNAME=	mediamtx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20.1
-PORTREVISION=	1
+DISTVERSION=	1.21.0
 CATEGORIES=	multimedia net
-MASTER_SITES+=	https://github.com/video-dev/hls.js/releases/download/v1.7.0/:hlsjs
+MASTER_SITES+=	https://github.com/video-dev/hls.js/releases/download/v1.7.2/:hlsjs
 DISTFILES+=	release.zip:hlsjs
 
 MAINTAINER=	diizzy@FreeBSD.org
 COMMENT=	Ready-to-use RTSP / RTMP / LL-HLS / WebRTC server and proxy that allows to read, publish and proxy video and audio streams
 WWW=		https://github.com/bluenviron/mediamtx
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.26+,modules
 GO_MODULE=	github.com/bluenviron/mediamtx
 
 USE_RC_SUBR=	mediamtx
 
 USERS=		mediamtx
 GROUPS=		mediamtx
 
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 post-extract:
 	${MV} ${WRKDIR}/dist/hls.min.js ${WRKSRC}/internal/servers/hls
 	${RM} -r ${WRKSRC}/internal/staticsources/rpicamera
 
 pre-configure:
 	${ECHO} ${DISTVERSIONFULL} > ${WRKSRC}/internal/core/VERSION
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mediamtx.yml ${STAGEDIR}${PREFIX}/etc/mediamtx.yml.sample
 	
 .include <bsd.port.mk>
diff --git a/multimedia/mediamtx/distinfo b/multimedia/mediamtx/distinfo
index 16c15f0f9d3c..e8d578dbc525 100644
--- a/multimedia/mediamtx/distinfo
+++ b/multimedia/mediamtx/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1787124866
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.20.1/release.zip) = e6f742917020e6f43b54270d71065763f2d92c4acf32dccf7dd76cb28832b2c3
-SIZE (go/multimedia_mediamtx/mediamtx-v1.20.1/release.zip) = 7654342
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.20.1/v1.20.1.mod) = 1802fb412be95f4b83436934169a7624d1d164b87cb82a2c13b2a9bb60165dc1
-SIZE (go/multimedia_mediamtx/mediamtx-v1.20.1/v1.20.1.mod) = 4482
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.20.1/v1.20.1.zip) = 8b8d488e574eda358c8b105513f9a3d9b316aa9383196826f5f004af16a22c80
-SIZE (go/multimedia_mediamtx/mediamtx-v1.20.1/v1.20.1.zip) = 976681
+TIMESTAMP = 1788654735
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.21.0/release.zip) = 6bdb7dcdcf22b23e29d5b324d866f5a589120a178f304aae1f793ead0af9666f
+SIZE (go/multimedia_mediamtx/mediamtx-v1.21.0/release.zip) = 7701769
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.21.0/v1.21.0.mod) = 2356f72294d1ea270b43fbb77f22de8995b65bf7290e73e9450f0f327aab7a83
+SIZE (go/multimedia_mediamtx/mediamtx-v1.21.0/v1.21.0.mod) = 4484
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.21.0/v1.21.0.zip) = b5f4830481006a223353041cf60eae7c2e623589ebdcd04242f26f0aba261a7c
+SIZE (go/multimedia_mediamtx/mediamtx-v1.21.0/v1.21.0.zip) = 1019005
diff --git a/multimedia/mediamtx/files/patch-internal_core_core.go b/multimedia/mediamtx/files/patch-internal_core_core.go
index ce2ae38f56e1..bc69cc1ebb43 100644
--- a/multimedia/mediamtx/files/patch-internal_core_core.go
+++ b/multimedia/mediamtx/files/patch-internal_core_core.go
@@ -1,34 +1,95 @@
---- internal/core/core.go.orig	2026-06-12 22:46:57 UTC
+--- internal/core/core.go.orig	2026-09-06 07:05:41 UTC
 +++ internal/core/core.go
-@@ -102,7 +102,7 @@ var cli struct {
+@@ -38,7 +38,7 @@ import (
+ 	"github.com/bluenviron/mediamtx/internal/servers/rtsp"
+ 	"github.com/bluenviron/mediamtx/internal/servers/srt"
+ 	"github.com/bluenviron/mediamtx/internal/servers/webrtc"
+-	"github.com/bluenviron/mediamtx/internal/upgrade"
++//	"github.com/bluenviron/mediamtx/internal/upgrade"
+ )
+ 
+ //go:generate go run ./versiongetter
+@@ -162,8 +162,8 @@ var cli struct {
+ var cli struct {
  	Confpath     string `arg:"" default:""`
  	Version      bool   `help:"print version"`
- 	CheckVersion bool   `help:"check whether a new version is available"`
+-	CheckVersion bool   `help:"check whether a new version is available"`
 -	Upgrade      bool   `help:"upgrade executable to the latest version"`
++//	CheckVersion bool   `help:"check whether a new version is available"`
 +//	Upgrade      bool   `help:"upgrade executable to the latest version"`
+ 	ValidateConf string `help:"check whether a configuration file is valid" placeholder:"path"`
  }
  
- // Core is an instance of MediaMTX.
-@@ -176,14 +176,14 @@ func New(args []string) (*Core, bool) {
+@@ -263,17 +263,17 @@ func New(args []string) (*Core, bool) {
+ 	if cli.Version {
+ 		oneShotCount++
+ 	}
+-	if cli.CheckVersion {
+-		oneShotCount++
+-	}
+-	if cli.Upgrade {
+-		oneShotCount++
+-	}
++//	if cli.CheckVersion {
++//		oneShotCount++
++//	}
++//	if cli.Upgrade {
++//		oneShotCount++
++//	}
+ 	if cli.ValidateConf != "" {
+ 		oneShotCount++
+ 	}
+ 	if oneShotCount > 1 {
+-		fmt.Printf("ERR: %v\n", "only one of --version, --check-version, --upgrade and --validate-conf can be used at a time")
++		fmt.Printf("ERR: %v\n", "only one of --version and --validate-conf can be used at a time")
+ 		return nil, false
+ 	}
+ 
+@@ -282,27 +282,27 @@ func New(args []string) (*Core, bool) {
  		os.Exit(0)
  	}
  
+-	if cli.CheckVersion {
+-		var newVersionAvailable bool
+-		newVersionAvailable, err = upgrade.CheckVersion(string(version), getArch())
+-		if err != nil {
+-			fmt.Printf("ERR: %v\n", err)
+-			os.Exit(1)
+-		}
+-		if newVersionAvailable {
+-			os.Exit(2)
+-		}
+-		os.Exit(0)
+-	}
++//	if cli.CheckVersion {
++//		var newVersionAvailable bool
++//		newVersionAvailable, err = upgrade.CheckVersion(string(version), getArch())
++//		if err != nil {
++//			fmt.Printf("ERR: %v\n", err)
++//			os.Exit(1)
++//		}
++//		if newVersionAvailable {
++//			os.Exit(2)
++//		}
++//		os.Exit(0)
++//	}
+ 
 -	if cli.Upgrade {
 -		err = upgrade.Upgrade(string(version), getArch())
 -		if err != nil {
 -			fmt.Printf("ERR: %v\n", err)
 -			os.Exit(1)
 -		}
 -		os.Exit(0)
 -	}
 +//	if cli.Upgrade {
 +//		err = upgrade.Upgrade(string(version), getArch())
 +//		if err != nil {
 +//			fmt.Printf("ERR: %v\n", err)
 +//			os.Exit(1)
 +//		}
 +//		os.Exit(0)
 +//	}
  
- 	ctx, ctxCancel := context.WithCancel(context.Background())
- 
+ 	if cli.ValidateConf != "" {
+ 		ok := validateConf(cli.ValidateConf)