diff --git a/cbox-tree.d/usr/share/cryptobox/templates/doc.cs b/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
index db7942a..1ac614c 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
@@ -1,5 +1,5 @@
 <div id="doc">
 
-<?cs include:DocDir + '/' + Data.Doc.Page + '.html' ?>
+<?cs include:DocDir + '/' + DocLang + '/' + Data.Doc.Page + '.html' ?>
 
 </div>
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBox.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBox.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBox.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBox.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDev.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDev.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDev.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDev.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevCustomBuild.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevCustomBuild.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevCustomBuild.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevCustomBuild.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevCustomConfigure.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevCustomConfigure.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevCustomConfigure.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevCustomConfigure.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevPreparation.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevPreparation.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevPreparation.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevPreparation.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevValidation.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevValidation.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevValidation.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevValidation.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevWorkFlow.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevWorkFlow.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxDevWorkFlow.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxDevWorkFlow.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxEn.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxEn.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxEn.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxEn.html
diff --git a/cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxKonzept.html b/cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxKonzept.html
similarity index 100%
rename from cbox-tree.d/usr/share/doc/cryptobox/html/CryptoBoxKonzept.html
rename to cbox-tree.d/usr/share/doc/cryptobox/html/en/CryptoBoxKonzept.html
diff --git a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
index b6e4eb6..18473c8 100755
--- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
+++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
@@ -21,6 +21,7 @@ my $config = ConfigFile::read_config_file('/etc/cryptobox/cryptobox.conf');
 $CB_SCRIPT = $config->{CB_SCRIPT};
 $LOG_FILE = $config->{LOG_FILE};
 $LANGUAGE_DIR = $config->{LANGUAGE_DIR};
+# language setting may be later overriden by "weblang"
 $LANGUAGE = $config->{LANGUAGE};
 $TEMPLATE_DIR = $config->{TEMPLATE_DIR};
 $DOC_DIR = $config->{DOC_DIR};
@@ -246,13 +247,21 @@ $pagedata = load_hdf();
 if ($query->param('weblang')) {
 	my $weblang = $query->param('weblang');
 	if (&validate_language($weblang)) {
-		&log_msg("lang: $weblang");
 		# load the data
 		&load_language_data($pagedata, "$weblang");
-		&log_msg("loaded: $weblang");
 		# add the setting to every link
 		$pagedata->setValue('Data.PostData.weblang', "$weblang");
-		&log_msg("set: $weblang");
+		# select documentation
+		if (-e "$DOC_DIR/$weblang") {
+			# selected web interface language
+			$pagedata->setValue('Data.DocLang', "$weblang");
+		} elseif (-e "$DOC_DIR/$LANGUAGE") {
+			# default CryptoBox language
+			$pagedata->setValue('Data.DocLang', "$LANGUAGE");
+		} else {
+			# default hardcoded language (english)
+			$pagedata->setValue('Data.DocLang', "en");
+		}
 	} else {
 		$pagedata->setValue('Data.Warning', 'InvalidLanguage');
 	}
diff --git a/tools/userdocexport.sh b/tools/userdocexport.sh
index 664bea5..28b156f 100755
--- a/tools/userdocexport.sh
+++ b/tools/userdocexport.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+#
+# TODO: only for english - change this!
+#
+
 set -u
 
 # root directory of the cryptobox development environment
@@ -14,7 +18,7 @@ WIKI_URL=/toolforge/
 
 CBOX_CGI="/cryptobox?action=doc\&page="
 
-DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html"
+DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html/en"
 IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-img"
 TMP_DIR=/tmp/$(basename $0)-$$.d