diff --git a/media-video/mpv/mpv-0.23.0.recipe b/media-video/mpv/mpv-0.23.0.recipe
index c4dce24c2..4795b5dfb 100644
--- a/media-video/mpv/mpv-0.23.0.recipe
+++ b/media-video/mpv/mpv-0.23.0.recipe
@@ -2,14 +2,17 @@ SUMMARY="A free, open source, and cross-platform media player"
 DESCRIPTION="mpv is a media player based on MPlayer and mplayer2. It supports \
 a wide variety of video file formats, audio and video codecs, and subtitle \
 types."
-HOMEPAGE="http://mpv.io"
+HOMEPAGE="https://mpv.io/"
 COPYRIGHT="2013-2016 MPV Developers"
 LICENSE="GNU GPL v2"
-REVISION="1"
-
-SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.zip"
-CHECKSUM_SHA256="94959e69c2004236e54a05f618b1a0316c6e3acb9db37a4856242ba2495283a6"
-SOURCE_DIR="mpv-$portVersion"
+REVISION="2"
+SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998"
+SOURCE_FILENAME="mpv-$portVersion.tar.gz"
+SOURCE_FILENAME_2="waf-1.8.12"
+SOURCE_URI_2="https://waf.io/$SOURCE_FILENAME_2#noarchive
+	http://www.freehackers.org/~tnagy/release/$SOURCE_FILENAME_2#noarchive"
+CHECKSUM_SHA256_2="01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -76,7 +79,12 @@ GLOBAL_WRITABLE_FILES="settings/mpv/encoding-profiles.conf keep-old"
 
 BUILD()
 {
-	python bootstrap.py
+	# Do not call "python bootstrap.py" as it (only) downloads waf.
+#	python bootstrap.py
+	# Instead, copy the archive from SOURCE_URI_2.
+	cp $sourceDir2/$SOURCE_FILENAME_2 waf
+	chmod +x waf
+
 	export LDFLAGS=-lnetwork
 	waf configure --disable-libass --enable-sdl2 --bindir=$binDir \
 		--confdir=$settingsDir/mpv --disable-gl --datadir=$dataDir