diff --git a/Makefile b/Makefile
index 1d207cd0250..18e3d4fe82a 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,10 @@ website_files = \
   out/doc/favicon.ico   \
 	out/doc/pipe.css
 
-doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+doc: doc
+
+out/doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+
 
 $(apidoc_dirs):
 	mkdir -p $@
@@ -126,11 +129,19 @@ distclean: docclean
 check:
 	@tools/waf-light check
 
-VERSION=$(shell git describe)
+VERSION=v$(shell python tools/getnodeversion.py)
 TARNAME=node-$(VERSION)
+TARBALL=$(TARNAME).tar.gz
+PKG=dist-osx/$(TARNAME).pkg
 
 #dist: doc/node.1 doc/api
-dist: doc
+dist: $(TARBALL) $(PKG)
+
+$(PKG):
+	-rm -rf dist-osx
+	tools/osx-dist.sh
+
+$(TARBALL): out/doc
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
 	mkdir -p $(TARNAME)/doc
 	cp doc/node.1 $(TARNAME)/doc/node.1
@@ -141,6 +152,11 @@ dist: doc
 	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar
 
+dist-upload: $(TARBALL) $(PKG)
+	ssh node@nodejs.org mkdir -p web/nodejs.org/dist/$(VERSION)
+	scp $(TARBALL) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL)
+	scp $(PKG) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARNAME).pkg
+
 bench:
 	 benchmark/http_simple_bench.sh
 
@@ -157,4 +173,4 @@ cpplint:
 
 lint: jslint cpplint
 
-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean dist-upload check uninstall install all program staticlib dynamiclib test test-all website-upload