diff --git a/.travis.yml b/.travis.yml
index 8fe4c4c8..016aa9b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,17 +25,21 @@ before_install:
   - pushd cyrus-sasl2-2.1.27~101-g0780600+dfsg.orig && ./autogen.sh && make && sudo make install && popd
 
 install:
-  - sudo apt install -y libssl-dev libsqlite3-dev libbz2-dev zlib1g-dev python3.5-dev 
+  - sudo apt install -y libssl-dev libsqlite3-dev libbz2-dev zlib1g-dev python3.5-dev sphinx-doc
 
 script:
-  - mkdir -p builddir && cd builddir && meson && ninja -v && sudo ninja install 
-  - export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH 
-  - sudo ldconfig -v 
+  - mkdir -p builddir && cd builddir && meson && ninja -v && sudo ninja install
+  - export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
+  - sudo ldconfig -v
   - cd ../docs
   - doxygen
   - cd ../python
   - virtualenv -p /usr/bin/python3.5 venv
   - source venv/bin/activate
-  - pip install tox 
+  - pip install tox
   - ldd /usr/local/lib/x86_64-linux-gnu/libdeltachat.so
   - tox
+  - pip install -e .
+  - pip install sphinx breathe
+  - cd doc
+  - BRANCH=$(TRAVIS_BRANCH) make install
diff --git a/python/doc/Makefile b/python/doc/Makefile
index 5dd52ac8..7f6b41af 100644
--- a/python/doc/Makefile
+++ b/python/doc/Makefile
@@ -8,6 +8,7 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
+RSYNCOPTS     = -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 
 export HOME=/tmp/home
 export TESTHOME=$(HOME)
@@ -27,8 +28,8 @@ USER_MAN_CHAPTERS = commands\
 #                 userman/index.rst\
 #                 userman/devpi_misc.rst\
 #                 userman/devpi_concepts.rst\
-          
-                                 
+
+
 #export DEVPI_CLIENTDIR=$(CURDIR)/.tmp_devpi_user_man/client
 #export DEVPI_SERVERDIR=$(CURDIR)/.tmp_devpi_user_man/server
 
@@ -62,7 +63,7 @@ help:
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-	@echo 
+	@echo
 	@echo "User Manual Regen Targets"
 	@echo "  regen.uman        regenerates page. of the user manual chapeter e.g. regen.uman chapter=..."
 	@echo "  regen.uman-all    regenerates the user manual"
@@ -79,8 +80,8 @@ doczip: html
 	python doczip.py $(DOCZIP) _build/html
 
 install: html
-	rsync -avz _build/html/ delta@py.delta.chat:build/master
-		
+	rsync -avz $(RSYNCOPTS) _build/html/ delta@py.delta.chat:build/master
+
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html