diff --git a/scripts/extract_user_doc.rb b/scripts/extract_user_doc.rb
index 34b6daf56..d83b99a78 100755
--- a/scripts/extract_user_doc.rb
+++ b/scripts/extract_user_doc.rb
@@ -25,10 +25,10 @@ def xml2html(t)
 end
 
 title = "KLayout "
-title += (ENV["KLAYOUT_VERSION"] || "$version") + " "
+title += ($klayout_version || "$version") + " "
 title += "("
-title += (ENV["KLAYOUT_VERSION_DATE"] || "$date") + " "
-title += (ENV["KLAYOUT_VERSION_REV"] || "$rev")
+title += ($klayout_version_date || "$date") + " "
+title += ($klayout_version_rev || "$rev")
 title += ") "
 title += ($target_info && $target_info != "" ? "[#{$target_info}] " : "") 
 
diff --git a/scripts/extract_user_doc.sh b/scripts/extract_user_doc.sh
index 7eadefeb3..331513e55 100755
--- a/scripts/extract_user_doc.sh
+++ b/scripts/extract_user_doc.sh
@@ -54,7 +54,14 @@ for qt in 5 4; do
   export KLAYOUT_HOME=$bin
 
   rm -f $bin/help-index.xml
-  $bin/klayout -rx -b -rd "target_doc=$target_doc" -rd "target_info=$info" -rd "qt=$qt" -r $inst_dir/extract_user_doc.rb
+  $bin/klayout -rx -b \
+    -rd "klayout_version=$KLAYOUT_VERSION" \
+    -rd "klayout_version_rev=$KLAYOUT_VERSION_REV" \
+    -rd "klayout_version_date=$KLAYOUT_VERSION_DATE" \
+    -rd "target_doc=$target_doc" \
+    -rd "target_info=$info" \
+    -rd "qt=$qt" \
+    -r $inst_dir/extract_user_doc.rb
 
   # just big:
   # mv $bin/help-index.xml $target_doc/help-index.data