diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile
index c5d0756f0dbc..ac2f96bb5588 100644
--- a/audio/lv2core/Makefile
+++ b/audio/lv2core/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lv2core
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://lv2plug.in/spec/
 
@@ -16,15 +17,36 @@ COMMENT=	LV2 Core Package
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 USE_GNOME=	pkgconfig
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+WAF_VERBOSE=	--verbose
+.endif
+
+.if defined(MAKE_JOBS_NUMBER)
+WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/autowaf.build_pc/s|^|#|' ${WRKSRC}/wscript
+	@(cd ${WRKSRC} && ${SED} -e \
+		's|@PREFIX@|${PREFIX}| ; \
+		 s|@EXEC_PREFIX@|${PREFIX}| ; \
+		 s|@LIBDIR@|${PREFIX}/lib| ; \
+		 s|@INCLUDEDIR@|${PREFIX}/include| ; \
+		 s|@LV2CORE_VERSION@|${PORTVERSION}|' < lv2core.pc.in > lv2core.pc)
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} DESTDIR=${LOCALBASE} ./waf configure
-	${REINPLACE_CMD} -e '42s|lib|libdata|g' ${WRKSRC}/build/c4che/_cache.py
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
 
 do-build:
-	cd ${WRKSRC} && ./waf build
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} ${WAF_JOBS} build)
 
 do-install:
-	cd ${WRKSRC} && ./waf install
+	@(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} install)
+	@${STRIP_CMD} ${PREFIX}/bin/lv2config
+	${INSTALL_DATA} ${WRKSRC}/lv2core.pc ${PREFIX}/libdata/pkgconfig
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/lv2core/pkg-plist b/audio/lv2core/pkg-plist
index 38eb99e9bc1d..f4a0d77ef87a 100644
--- a/audio/lv2core/pkg-plist
+++ b/audio/lv2core/pkg-plist
@@ -1,7 +1,7 @@
 bin/lv2config
 include/lv2.h
-lib/lv2/lv2core.lv2/lv2.ttl
 lib/lv2/lv2core.lv2/lv2.h
+lib/lv2/lv2core.lv2/lv2.ttl
 lib/lv2/lv2core.lv2/manifest.ttl
 libdata/pkgconfig/lv2core.pc
 @dirrm lib/lv2/lv2core.lv2