diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index e173aebafdcf..926f248e434c 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	syncthing
-PORTVERSION=	1.18.0
+PORTVERSION=	1.18.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
 
 USES=		cpe go
 
 USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv
 
 BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor
 
 PORTDOCS=	*
 
 USERS=		syncthing
 GROUPS=		syncthing
 
 # Anonymize
 MAKE_ENV+=	BUILD_USER=ports BUILD_HOST=freebsd
 
 OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
 		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build ; \
 		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \
 		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \
 		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \
 		)
 
 do-install:
 .for x in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${PREFIX}/bin/
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in AUTHORS LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 796287005e7c..019a94a64441 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626354379
-SHA256 (syncthing-source-v1.18.0.tar.gz) = 169d3579b74083d4115b4d324620a7f0888e4b1a3ad3dac71d46d76d51322900
-SIZE (syncthing-source-v1.18.0.tar.gz) = 12856546
+TIMESTAMP = 1630113856
+SHA256 (syncthing-source-v1.18.1.tar.gz) = 3f6b8e87a59e72ab3389d89364524e6abec454d4c36aaf3e334ac6fe37915584
+SIZE (syncthing-source-v1.18.1.tar.gz) = 12860998
diff --git a/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go
new file mode 100644
index 000000000000..2b817687cf6e
--- /dev/null
+++ b/net/syncthing/files/patch-syncthing_lib_beacon_multicast.go
@@ -0,0 +1,12 @@
+--- syncthing/lib/beacon/multicast.go.orig	2021-07-06 12:51:32 UTC
++++ syncthing/lib/beacon/multicast.go
+@@ -126,6 +126,9 @@ func readMulticasts(ctx context.Context, outbox chan<-
+ 	pconn := ipv6.NewPacketConn(conn)
+ 	joined := 0
+ 	for _, intf := range intfs {
++		if intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0 || intf.Name == "ipfw0" {
++			continue
++		}
+ 		err := pconn.JoinGroup(&intf, &net.UDPAddr{IP: gaddr.IP})
+ 		if err != nil {
+ 			l.Debugln("IPv6 join", intf.Name, "failed:", err)