diff --git a/Makefile b/Makefile
index f444987..0242819 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 
 # Other repos with documentation to include.
 # edit the `git_refs` file with the commit/tag/branch that you want to use
-OTHER_REPO_DOCS ?= bbsim voltha-go voltha-openolt-adapter voltha-openonu-adapter voltha-protos
+OTHER_REPO_DOCS ?= bbsim voltha-go voltha-openolt-adapter voltha-openonu-adapter voltha-protos voltctl voltha-system-tests
 
 # Put it first so that "make" without argument is like "make help".
 help: doc_venv
@@ -55,7 +55,7 @@
 
 # clean up
 clean:
-	rm -rf $(BUILDDIR) $(OTHER_REPO_DOCS) repos/voltha-system-tests _static/voltha-system-tests
+	rm -rf $(BUILDDIR) $(OTHER_REPO_DOCS) _static/voltha-system-tests
 
 clean-all: clean
 	rm -rf doc_venv repos
@@ -90,6 +90,12 @@
 	GIT_SUBDIR=`grep '^$@ ' git_refs | awk '{print $$2}'` ;\
 	ln -s repos/$(@)$$GIT_SUBDIR $@ ;\
 
+# Build Robot documentation in voltha-system-tests and copy it into _static.
+_static/voltha-system-tests: | $(OTHER_REPO_DOCS)
+	make -C voltha-system-tests gendocs
+	mkdir -p $@
+	cp -r voltha-system-tests/gendocs/* $@
+
 # generate a list of git checksums suitable for updating git_refs
 freeze: repos
 	@for repo in $(OTHER_REPO_DOCS) ; do \
@@ -120,12 +126,3 @@
 	source $</bin/activate ; set -u ;\
 	$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-repos/voltha-system-tests: | repos
-	if [ ! -d '$@' ] ;\
-	  then git clone $(REPO_HOST)/$(@F) $@ ;\
-	fi
-
-_static/voltha-system-tests: repos/voltha-system-tests
-	make -C $< gendocs
-	mkdir -p $@
-	cp -r $</gendocs/* $@