diff --git a/docs/Makefile b/docs/Makefile
index 1aaf1cf7e..1f3f7d76c 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -145,10 +145,11 @@ usage: $(shell borg help | grep -A1 "Available commands:" | tail -1 | sed 's/[{}
 
 # generate help file based on usage
 usage/%.rst.inc: ../borg/archiver.py
-	printf ".. _borg_$*:\n\n" > $@
-	printf "borg $*\n" >> $@
-	echo -n borg $* | tr 'a-z- ' '-' >> $@
-	printf "\n::\n\n" >> $@
-	borg help $* --usage-only | sed -e 's/^/    /' >> $@
-	printf "\nDescription\n~~~~~~~~~~~\n" >> $@
-	borg help $* --epilog-only >> $@
+	@echo generating usage for $*
+	@printf ".. _borg_$*:\n\n" > $@
+	@printf "borg $*\n" >> $@
+	@echo -n borg $* | tr 'a-z- ' '-' >> $@
+	@printf "\n::\n\n" >> $@
+	@borg help $* --usage-only | sed -e 's/^/    /' >> $@
+	@printf "\nDescription\n~~~~~~~~~~~\n" >> $@
+	@borg help $* --epilog-only >> $@
diff --git a/docs/api.rst b/docs/api.rst
new file mode 100644
index 000000000..c535aa970
--- /dev/null
+++ b/docs/api.rst
@@ -0,0 +1,6 @@
+Borg Backup API documentation
+=============================
+
+.. automodule:: borg
+   :members:
+   :undoc-members: