diff --git a/Makefile b/Makefile
index 7875083cf..8e5bc5587 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,24 @@
-# create virtual environment
+# Set of targets useful for development/release process
 PYTHON = python2.7
+PATH := $(PWD)/.env/bin:$(PATH)
 
+# prepare virtual python environment
 .env:
 	virtualenv .env -p $(PYTHON)
 
 # install all needed for development
 develop: .env
-	.env/bin/pip install -e . tox
+	pip install -e . tox -r requirements-docs.txt
 
 # clean the development envrironment
 clean:
 	-rm -rf .env
+
+# generate documentation
+docs: develop
+	cd doc/en; make html
+	find doc/en/ -name '*.txt' | xargs .env/bin/regendoc
+
+# upload documentation
+upload-docs: develop
+	cd doc/en; make install
diff --git a/requirements-docs.txt b/requirements-docs.txt
new file mode 100644
index 000000000..9a7a1049f
--- /dev/null
+++ b/requirements-docs.txt
@@ -0,0 +1,2 @@
+sphinx==1.2.3
+hg+ssh://hg@bitbucket.org/RonnyPfannschmidt/regendoc#egg=regendoc