diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index c7921b53a0..d8d589335a 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -1,6 +1,6 @@
 # Template file for 'ninja'
 pkgname=ninja
-version=1.5.1
+version=1.5.3
 revision=1
 hostmakedepends="python asciidoc git"
 short_desc="Small build system with a focus on speed"
@@ -13,14 +13,20 @@ homepage="http://martine.github.io/ninja/"
 do_fetch() {
 	git clone -b v${version} git://github.com/martine/ninja ${pkgname}-${version}
 }
+
+do_configure() {
+	# Skip rebuild with bootstrapped ninja until build phase:
+	sed -e "s|subprocess.check_call('./ninja', shell=True)|pass|" -i configure.py
+	python2 configure.py --bootstrap
+}
+
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		HOST_CXXFLAGS="-O2 -fstack-protector-strong"
 	else
 		HOST_CXXFLAGS="${CXXFLAGS}"
 	fi
-	sed -e 's,CXX,HOST_CXX,g;s,CFLAGS,HOST_CXXFLAGS,g' -i bootstrap.py
-	HOST_CXX=g++ HOST_CXXFLAGS="$HOST_CXXFLAGS" python2 ./bootstrap.py --verbose
+	CXXFLAGS="$HOST_CXXFLAGS" python2 configure.py
 	asciidoc doc/manual.asciidoc
 }
 do_install() {