diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile
index 4e3cefc16b2a..95696b809fdc 100644
--- a/audio/strawberry/Makefile
+++ b/audio/strawberry/Makefile
@@ -1,73 +1,76 @@
 PORTNAME=	strawberry
 DISTVERSION=	1.2.2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/strawberrymusicplayer/strawberry/commit/
+PATCHFILES=	d396cb515d5112be866c2510127a111dab5d313a.patch:-p1 # https://github.com/strawberrymusicplayer/strawberry/issues/1610
+
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Music player and collection organizer
 WWW=		https://www.strawberrymusicplayer.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libtag.so:audio/taglib
 TEST_DEPENDS=	googletest>=0:devel/googletest
 
 USES=		cmake:testing compiler:c++17-lang desktop-file-utils \
 		gl gnome gstreamer pkgconfig qt:6 sqlite tar:xz xorg
 USE_GL=		opengl
 USE_GNOME=	glib20
 USE_GSTREAMER=	faac faad flac lame libav mpg123 opus taglib vorbis
 USE_QT=		base sqldriver-sqlite:run
 USE_XORG=	ice sm x11 xcb xext
 
 CMAKE_OFF=		ENABLE_UDISKS2
 CMAKE_TESTING_SETENV=	yes
 CMAKE_TESTING_TARGET=	strawberry_tests
 
 OPTIONS_DEFINE=		CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS
 OPTIONS_DEFAULT=	ALSA EBUR128 MOODBAR MUSICBRAINZ
 OPTIONS_MULTI=		SOUND
 OPTIONS_MULTI_SOUND=	ALSA PULSEAUDIO
 OPTIONS_SUB=		yes
 
 EBUR128_DESC=		EBU R 128 loudness normalization
 IPOD_DESC=		iPod Classic support
 MOODBAR_DESC=		Moodbar support
 MUSICBRAINZ_DESC=	Tagging/fingerprinting from MusicBrainz
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 CDIO_USE=		GSTREAMER=cdparanoia
 CDIO_CMAKE_BOOL=	ENABLE_AUDIOCD
 
 EBUR128_USES=		ebur128
 EBUR128_CMAKE_BOOL=	ENABLE_EBUR128
 
 IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
 			libimobiledevice-1.0.so:comms/libimobiledevice \
 			libplist-2.0.so:devel/libplist
 IPOD_USE=		GNOME=gdkpixbuf2
 IPOD_CMAKE_BOOL=	ENABLE_GPOD
 
 MOODBAR_LIB_DEPENDS=	libfftw3.so:math/fftw3
 MOODBAR_CMAKE_BOOL=	ENABLE_MOODBAR
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_BOOL=		ENABLE_MTP
 
 MUSICBRAINZ_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 MUSICBRAINZ_CMAKE_BOOL=		ENABLE_MUSICBRAINZ \
 				ENABLE_SONGFINGERPRINTING
 
 NLS_USE=		QT=tools:build
 NLS_CMAKE_BOOL=		ENABLE_TRANSLATIONS
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSE
 
 .include <bsd.port.mk>
diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo
index 49367cb568d0..9fa3829af1e6 100644
--- a/audio/strawberry/distinfo
+++ b/audio/strawberry/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1732431674
+TIMESTAMP = 1732933915
 SHA256 (strawberry-1.2.2.tar.xz) = 3543ca25f3b7fc913f3986a8cb5f5f6f323549a71c21cc0c1a3491fe4d135177
 SIZE (strawberry-1.2.2.tar.xz) = 11460012
+SHA256 (d396cb515d5112be866c2510127a111dab5d313a.patch) = d3bf89ffae0721010c816855c1c7d849e1b56af44240051e8153400128659b66
+SIZE (d396cb515d5112be866c2510127a111dab5d313a.patch) = 2664
diff --git a/audio/strawberry/files/patch-src_device_cddadevice.h b/audio/strawberry/files/patch-src_device_cddadevice.h
deleted file mode 100644
index 658e5191492f..000000000000
--- a/audio/strawberry/files/patch-src_device_cddadevice.h
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix conflicting definitions of NULL beween glib and cdio when CDIO option
-is enabled.
-
-https://github.com/strawberrymusicplayer/strawberry/issues/1610
-
---- src/device/cddadevice.h.orig	2024-11-23 16:55:49 UTC
-+++ src/device/cddadevice.h
-@@ -24,13 +24,14 @@
- 
- #include "config.h"
- 
--#include <cdio/cdio.h>
--#include <gst/audio/gstaudiocdsrc.h>
--
- #include <QObject>
- #include <QString>
- #include <QStringList>
- #include <QUrl>
-+
-+// These must come after Qt includes
-+#include <cdio/cdio.h>
-+#include <gst/audio/gstaudiocdsrc.h>
- 
- #include "includes/shared_ptr.h"
- #include "core/song.h"