diff --git a/dev-util/build/ChangeLog b/dev-util/build/ChangeLog
--- a/dev-util/build/ChangeLog
+++ b/dev-util/build/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jan 2010; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> build-0.3.5.ebuild:
+  As committed for sunrise r9900. Cleaned up docs installation and SRC_URI
+  generation.
+
   18 Jan 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> build-0.3.5.ebuild:
   Cleaned up documentation installation using find -regex.
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
--- a/dev-util/build/Manifest
+++ b/dev-util/build/Manifest
@@ -1,4 +1,4 @@
 DIST build-0.3.5.tar.bz2 65872 RMD160 df3b85caae99f1538d2c9c28eb210ed5b3255bb2 SHA1 7a2fa91cea87b97c80568f5fc076861365ebeb61 SHA256 bd18bafafeb6c861932b3a6e2dd2eb1a9a8f9f3f1972b8de1b776b0a8854a08d
-EBUILD build-0.3.5.ebuild 1409 RMD160 24f7e5f2ae0d3656662873492fb1a43c43051185 SHA1 af83ee4385afd4facf1be3a326c561f1d5fa43ad SHA256 660cad5c7a8f93199ba906bce12ecc5539333d043351292d4d99b08e440c9716
-MISC ChangeLog 447 RMD160 79c328b4b64d5a95f9286b3a6d6e457ca6a83ef6 SHA1 f6892359968996d8883f3b5bbd43be71f764a698 SHA256 28a3a1b708731659e7345537c0debd7a6ea3b45de90640bb65342d6e9e4d25d8
+EBUILD build-0.3.5.ebuild 1535 RMD160 df08f62befe422d1e735088c0a682f6a8229774e SHA1 ee33be7844d8aaabb02aa38a6b29f18391d2c057 SHA256 0faac447494c0acc981c666d5ee61182d6d1cb1ee70f8112e9edad8e0905bb85
+MISC ChangeLog 638 RMD160 68320907dc7ac8e947e978c63ed2651b575966b2 SHA1 bfffb2a6f0be5b20f91d602c7876f21e0db68e50 SHA256 7d062b6977bff7bd5a2ee66e101285106902dbe975c3e6aae23f4f89e458c93c
 MISC metadata.xml 290 RMD160 477ae5b5f81ab27749d5e68e95bb3cde684ec753 SHA1 6c94a51c1738c49bdf08b92fc7e6583875f65781 SHA256 c1f650400a8fb43cc289484e44c1620b2f8addd8a8069e197efca20347ddcaf7
diff --git a/dev-util/build/build-0.3.5.ebuild b/dev-util/build/build-0.3.5.ebuild
--- a/dev-util/build/build-0.3.5.ebuild
+++ b/dev-util/build/build-0.3.5.ebuild
@@ -4,9 +4,12 @@
 
 EAPI=2
 
+inherit versionator
+
+MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="A massively-parallel software build system implemented on top of GNU make"
 HOMEPAGE="http://kolpackov.net/projects/build/"
-SRC_URI="ftp://kolpackov.net/pub/projects/${PN}/${PV%.?}/${P}.tar.bz2"
+SRC_URI="ftp://kolpackov.net/pub/projects/${PN}/${MY_PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,10 +19,13 @@ IUSE="doc examples"
 src_prepare() {
 	if use examples; then
 		# fix examples to use installed build
-		sed -i -e "s;^include.\*bootstrap.make\$;include build-${PV%.?}/bootstrap.make;" \
-			examples/*/*/{*/,}build/bootstrap.make || die "patching examples failed"
+		sed -i -e "s;^include.\*bootstrap.make\$;include build-${MY_PV}/bootstrap.make;" \
+			$(find examples -name bootstrap.make) || die "patching examples failed"
 		rm examples/cxx/hello/hello/build/import/libhello || die "preparing examples for installation failed"
 	fi
+	if use doc; then
+		mv documentation/index.{x,}html || die
+	fi
 }
 
 src_install() {
@@ -28,7 +34,7 @@ src_install() {
 	dodoc NEWS README || die "dodoc failed"
 
 	if use doc; then
-		dohtml -A xhtml documentation/*.{css,xhtml} || die "installing HTML docs failed"
+		dohtml documentation/{default.css,index.html} || die "installing HTML docs failed"
 		dodoc $(find documentation -type f -regex '[^.]*') || die "installing plaintext docs failed"
 	fi