diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 2c742eeb51b0..beaf17f02035 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -1,28 +1,26 @@
 PORTNAME=	libmpd
 PORTVERSION=	11.8.17
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction around libmpdclient
 WWW=		https://gmpc.wikia.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnome libtool pathfix pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-Wno-error=int-conversion
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,libmpd-1.0\/libmpd,libmpd,' \
 		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpd.so
 
 .include <bsd.port.mk>
diff --git a/audio/libmpd/files/patch-src_libmpd-playlist.c b/audio/libmpd/files/patch-src_libmpd-playlist.c
new file mode 100644
index 000000000000..fb0c79fe88cf
--- /dev/null
+++ b/audio/libmpd/files/patch-src_libmpd-playlist.c
@@ -0,0 +1,11 @@
+--- src/libmpd-playlist.c.orig	2011-08-17 12:31:47 UTC
++++ 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 0;
+ 	}
+     mpd_sendLoadCommand(mi->connection,path);
+ 	mpd_finishCommand(mi->connection);