diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index e2ec1b25a75..0feb45ae6f9 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -4,7 +4,7 @@ VERSION=		11.8.17
 DISTNAME=		libmpd-${VERSION}
 SHARED_LIBS=		mpd	3.2	#.3.0
 CATEGORIES=		audio
-REVISION =		6
+REVISION =		7
 
 MAINTAINER=		Landry Breuil <landry@openbsd.org>
 
diff --git a/audio/libmpd/patches/patch-src_libmpd-playlist_c b/audio/libmpd/patches/patch-src_libmpd-playlist_c
new file mode 100644
index 00000000000..765e5ef14aa
--- /dev/null
+++ b/audio/libmpd/patches/patch-src_libmpd-playlist_c
@@ -0,0 +1,14 @@
+Fix return value, invalid pointer to integer conversion with clang 15.
+
+Index: src/libmpd-playlist.c
+--- src/libmpd-playlist.c.orig
++++ src/libmpd-playlist.c
+@@ -780,7 +780,7 @@ int mpd_playlist_load(MpdObj *mi, const char *path)
+ 	if(mpd_lock_conn(mi))
+ 	{
+ 		debug_printf(DEBUG_ERROR,"lock failed\n");
+-		return NULL;
++		return MPD_LOCK_FAILED;
+ 	}
+     mpd_sendLoadCommand(mi->connection,path);
+ 	mpd_finishCommand(mi->connection);