--- /usr/portage/net-libs/nodejs/nodejs-0.7.8.ebuild	2012-05-07 22:31:25.000000000 -0400
+++ nodejs-0.7.8-r9999.ebuild	2012-06-17 14:17:54.880839000 -0400
@@ -54,15 +54,18 @@
 
 	mkdir -p "${ED}"/usr/include/node
 	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/usr/lib/node
 	mkdir -p "${ED}"/lib/node_modules/npm
 	cp 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp 'deps/uv/include/ares.h' 'deps/uv/include/ares_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
 	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+	cp 'tools/node-waf' "${ED}"/usr/bin/node-waf || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/usr/lib/node || die "Failed to copy stuff"
 	cp -R deps/npm/* "${ED}"/lib/node_modules/npm || die "Failed to copy stuff"
 
 	# now add some extra stupid just because we can
 	# needs to be a symlink because of hardcoded paths ... no es bueno!
-	dosym /lib/node_modules/npm/bin/npm-cli.js /bin/npm
+	dosym /lib/node_modules/npm/bin/npm-cli.js /usr/bin/npm
 	pax-mark -m "${ED}"/usr/bin/node
 }