diff --git a/Makefile b/Makefile
index 0fdfe23825..ae6332c6e0 100644
--- a/Makefile
+++ b/Makefile
@@ -44,27 +44,23 @@ test-pummel: all
 test-internet: all
 	python tools/test.py internet
 
-# http://rtomayko.github.com/ronn
-# gem install ronn
-doc: doc/node.1 doc/api.html doc/index.html doc/changelog.html
 
-## HACK to give the ronn-generated page a TOC
-doc/api.html: all doc/api.markdown doc/api_header.html doc/api_footer.html
-	build/default/node tools/ronnjs/bin/ronn.js --fragment doc/api.markdown \
-	| sed "s/<h2>\(.*\)<\/h2>/<h2 id=\"\1\">\1<\/h2>/g" \
-	| cat doc/api_header.html - doc/api_footer.html > doc/api.html
+doc: doc/api/all.html doc/changelog.html
+
+docopen: doc/api/all.html
+	-google-chrome doc/api/all.html
+
+doc/api/all.html: node  doc/api/*.markdown
+	./node tools/doctool/doctool.js
 
 doc/changelog.html: ChangeLog doc/changelog_header.html doc/changelog_footer.html
 	cat doc/changelog_header.html ChangeLog doc/changelog_footer.html > doc/changelog.html
 
-doc/node.1: doc/api.markdown all
-	build/default/node tools/ronnjs/bin/ronn.js --roff doc/api.markdown > doc/node.1
-
 website-upload: doc
 	scp doc/* ryan@nodejs.org:~/web/nodejs.org/
 
 docclean:
-	@-rm -f doc/node.1 doc/api.html doc/changelog.html
+	@-rm -f doc/node.1 doc/api/*.html doc/changelog.html
 
 clean:
 	@$(WAF) clean
diff --git a/tools/doctool/doctool.js b/tools/doctool/doctool.js
index c28402f84c..47153a2ffb 100644
--- a/tools/doctool/doctool.js
+++ b/tools/doctool/doctool.js
@@ -5,7 +5,7 @@ var fs = require("fs")
 
 var cwd = process.cwd()
   , doc_root = path.join(cwd, "doc/api/")
-  , build_root = path.join(cwd, "build/doc/api/")
+  , build_root = path.join(cwd, "doc/api/")
   , assets_path = path.join(cwd, "doc/api_assets/")
   , bassets_path = path.join(build_root, "assets/");
 
@@ -135,4 +135,4 @@ step(
   copyAssets,
   loadTemplates,
   convertFiles
-)();
\ No newline at end of file
+)();