diff --git a/Makefile b/Makefile
index d4f8f6d856..d72be1b890 100644
--- a/Makefile
+++ b/Makefile
@@ -42,3 +42,21 @@ gst_docs_HOTDOC_EXTRA_DEPS = theme.stamp
 .PHONY: all install clean
 
 -include $(shell $(HOTDOC) --makefile-path)
+
+# These variables define the location of the online docs
+#
+# If your local username and your fdo username differ, you
+# will need to add an entry for gstreamer.freedesktop.org
+# in your ~/.ssh/config with the right username for the server.
+#
+# DOC_SERVER = people.freedesktop.org
+# DOC_BASE = public_html/gst-docs
+DOC_SERVER = gstreamer.freedesktop.org
+DOC_BASE = /srv/gstreamer.freedesktop.org/public_html/documentation2
+
+# The local build directory with the generated HTML output
+BUILT_DOC_DIR = $(builddir)/built_doc/html/
+
+upload: all
+	rsync -rvaz -e ssh --links --delete $(BUILT_DOC_DIR) $(DOC_SERVER):$(DOC_BASE)
+	ssh $(DOC_SERVER) "chmod -R g+w $(DOC_BASE); chgrp -R gstreamer $(DOC_BASE)"