diff --git multimedia/mplayer2/multimedia/mpv/Makefile multimedia/mplayer2/multimedia/mpv/Makefile
index 2b6a3a7..69ec535 100644
--- multimedia/mplayer2/multimedia/mpv/Makefile
+++ multimedia/mplayer2/multimedia/mpv/Makefile
@@ -7,10 +7,6 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://ftp.waf.io/pub/release/:1 \
-		http://www.freehackers.org/~tnagy/release/:1
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} waf-${WAF_VERSION}:1
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cpm@fbsd.es
 COMMENT=	Free and open-source general-purpose video player
@@ -22,9 +18,11 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mpv-player
+GH_ACCOUNT=	mpv-player waf-project:waf
+GH_PROJECT=	waf:waf
+GH_TAGNAME=	waf-1.8.9:waf
 
-WAF_VERSION=	1.8.9
+WAF_CMD=	${WRKSRC_waf}/waf-light
 
 USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build waf
 USE_LDCONFIG=	yes
@@ -144,10 +142,6 @@ ZSH_CONFIGURE_ENABLE=		zsh-comp
 CFLAGS:=	${CFLAGS:N-O*} -O0
 .endif
 
-post-extract:
-	@${CP} ${DISTDIR}/waf-${WAF_VERSION} ${WRKSRC}/waf
-	@${CHMOD} +x ${WRKSRC}/waf
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \
 		${WRKSRC}/wscript_build.py
diff --git multimedia/mplayer2/multimedia/mpv/distinfo multimedia/mplayer2/multimedia/mpv/distinfo
index 5cc2148..894ccaf 100644
--- multimedia/mplayer2/multimedia/mpv/distinfo
+++ multimedia/mplayer2/multimedia/mpv/distinfo
@@ -1,4 +1,4 @@
 SHA256 (mpv-player-mpv-v0.9.2_GH0.tar.gz) = c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751
 SIZE (mpv-player-mpv-v0.9.2_GH0.tar.gz) = 2701306
-SHA256 (waf-1.8.9) = 751b4a0338a94e557c554b32e19137f70b67f3b2d1e748281f543307ce796674
-SIZE (waf-1.8.9) = 97060
+SHA256 (waf-project-waf-waf-1.8.9_GH0.tar.gz) = 166e7a52066d9dd3a6ab8349b65fd49a162ad94ac40c8b2ccdbb256c7faf2b9c
+SIZE (waf-project-waf-waf-1.8.9_GH0.tar.gz) = 1348211