diff --git a/multimedia/ustreamer/Makefile b/multimedia/ustreamer/Makefile
index 5ff906e51a62..70f3fcd88b69 100644
--- a/multimedia/ustreamer/Makefile
+++ b/multimedia/ustreamer/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	ustreamer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.50
+DISTVERSION=	6.0
 CATEGORIES=	multimedia net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight and fast MJPG-HTTP streamer
 WWW=		https://github.com/pikvm/ustreamer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		compiler:c11 gmake jpeg localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	pikvm
 
 MAKE_ARGS=	WITH_PTHREAD_NP=0 MANPREFIX=${PREFIX}/share/man
 
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	bin/ustreamer \
 		bin/ustreamer-dump \
 		share/man/man1/ustreamer-dump.1.gz \
 		share/man/man1/ustreamer.1.gz
 
 .include <bsd.port.mk>
diff --git a/multimedia/ustreamer/distinfo b/multimedia/ustreamer/distinfo
index b6173eeb0f7c..7e3d700578e9 100644
--- a/multimedia/ustreamer/distinfo
+++ b/multimedia/ustreamer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708158610
-SHA256 (pikvm-ustreamer-v5.50_GH0.tar.gz) = 645f411eff70af3c251a6646a9a3e329fabbf35ccc3a07b7ccf5dc7177bdf05c
-SIZE (pikvm-ustreamer-v5.50_GH0.tar.gz) = 150964
+TIMESTAMP = 1709795715
+SHA256 (pikvm-ustreamer-v6.0_GH0.tar.gz) = 5b5056b133f9eeec34eb7f94c646c7de41e564e7c2a44944214215dcdd3948fb
+SIZE (pikvm-ustreamer-v6.0_GH0.tar.gz) = 141441
diff --git a/multimedia/ustreamer/files/patch-src_Makefile b/multimedia/ustreamer/files/patch-src_Makefile
new file mode 100644
index 000000000000..780ca099c7f6
--- /dev/null
+++ b/multimedia/ustreamer/files/patch-src_Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2024-03-07 07:20:35 UTC
++++ src/Makefile
+@@ -14,7 +14,7 @@ _LDFLAGS = $(LDFLAGS)
+ _CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
+ _LDFLAGS = $(LDFLAGS)
+ 
+-_COMMON_LIBS = -lm -ljpeg -pthread -lrt -latomic
++_COMMON_LIBS = -lm -ljpeg -pthread -lrt
+ 
+ _USTR_LIBS = $(_COMMON_LIBS) -levent -levent_pthreads
+ _USTR_SRCS = $(shell ls \