diff --git a/Makefile b/Makefile
index db4eb59f54..a5a5090249 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,10 @@ DOC_BASE = /srv/gstreamer.freedesktop.org/public_html/documentation
 # The local build directory with the generated HTML output
 BUILT_DOC_DIR = $(builddir)/built_doc/html/
 
-upload: all
+check-for-hotdoc:
+	@$(HOTDOC) --version >/dev/null 2>/dev/null
+
+upload: check-for-hotdoc all
 	rsync -rvaz -e ssh --links --delete $(BUILT_DOC_DIR) $(DOC_SERVER):$(DOC_BASE) || /bin/true
 	ssh $(DOC_SERVER) "chmod -R g+w $(DOC_BASE); chgrp -R gstreamer $(DOC_BASE)"