diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index a153d6133940..6ac39c7da886 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libmusicbrainz4
+PORTNAME=	libmusicbrainz
 PORTVERSION=	4.0.3
 CATEGORIES=	audio
-MASTER_SITES=	https://cloud.github.com/downloads/metabrainz/${PORTNAME:S/4//}/
-DISTNAME=	${PORTNAME:S/4//}-${PORTVERSION}
+MASTER_SITES=	https://cloud.github.com/downloads/metabrainz/${PORTNAME}/
 
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	MusicBrainz client library for audio metadata lookup
@@ -18,8 +17,9 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	neon:${PORTSDIR}/www/neon29
 
+LATEST_LINK=	${PORTNAME}4
+
 USE_CMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
@@ -27,5 +27,7 @@ MAKE_JOBS_SAFE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
 		 ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		 ${WRKSRC}/cmake/modules/*.cmake
 
 .include <bsd.port.mk>