diff --git a/.travis.yml b/.travis.yml
index 9cfcc2aa..943bc1ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ install:
 # command to run tests
 script: 
   - make py
-  - make html
+  - make htmlall
   #- make linkcheck
 
 deploy:
diff --git a/Makefile b/Makefile
index 985b65cb..5f57bd99 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@
 all:
 	make -C source html
 
+htmlall:
+	make -C source htmlall
+
+htmlde:
+	make -C source htmlde
+
 html:
 	make -C source html
 
diff --git a/source/Makefile b/source/Makefile
index d4bbf007..5c93beae 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -53,6 +53,15 @@ help:
 clean:
 	rm -rf $(BUILDDIR)/*
 
+htmlall: 
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html	
+	$(SPHINXBUILD) -b html -D language='de' $(ALLSPHINXOPTS) $(BUILDDIR)/html/de
+
+htmlde:
+	$(SPHINXBUILD) -b html -D language='de' $(ALLSPHINXOPTS) $(BUILDDIR)/html/de 
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/de."
+
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
diff --git a/source/conf.py b/source/conf.py
index 716011c5..c388b79a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -140,8 +140,8 @@ html_context = {
     "conf_py_path": "/source/", # Path in the checkout to the docs root
     "current_version": current_version,
     "languages": ( ("English", ""),
-                   ("Mandarin", "/md"),
-                   ("Spanish", "/esp")
+                   ("Mandarin", "/zh_CN"),
+                   ("German", "/de")
                  ),
     "versions": ( ("latest", ""),
                   ("LTS 1", "/lts/v1"),