diff --git a/ChangeLog b/ChangeLog
index 161fcfb22..23ae4eb07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-23  Carl Worth  <cworth@cworth.org>
+
+	* Makefile.am: Add docs-publish target to build and push
+	documentation, (since our nightly server-side cron job is not
+	working right now).
+
 2005-08-23  Carl Worth  <cworth@cworth.org>
 
 	* BUGS:
diff --git a/Makefile.am b/Makefile.am
index 4e5125b09..8487343b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,14 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 # or		make release-publish
 
 RELEASE_UPLOAD_HOST =   cairographics.org
-RELEASE_UPLOAD_DIR =    /srv/cairo.freedesktop.org/www/snapshots
+RELEASE_UPLOAD_BASE =	/srv/cairo.freedesktop.org/www
+RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/snapshots
 RELEASE_URL_BASE = 	http://cairographics.org/snapshots
 RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org (and CC gnome-announce-list@gnome.org)
 
-CVS=cvs
+MANUAL_DATED =		cairo-manual-`date +%Y%m%d`
+MANUAL_TAR_FILE = 	$(MANUAL_DATED).tar.gz
+MANUAL_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)
 
 tar_file = $(PACKAGE)-$(VERSION).tar.gz
 sha1_file = $(tar_file).sha1
@@ -122,4 +125,12 @@ release-publish: release-upload releases/$(sha1_file)
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
 
+# XXX: Depending on all here is rather overkill. We don't really need
+# the library built in order to create the documentation.
+docs-publish: all
+	cp -a doc/public/html $(MANUAL_DATED)
+	tar czf $(MANUAL_TAR_FILE) $(MANUAL_DATED)
+	scp $(MANUAL_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
+	ssh $(RELEASE_UPLOAD_HOST) "cd $(MANUAL_UPLOAD_DIR) && tar xzf $(MANUAL_TAR_FILE) && rm -f manual && ln -s $(MANUAL_DATED) manual && ln -sf $(MANUAL_TAR_FILE) cairo-manual.tar.gz"
+
 .PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish