diff --git a/doc/nonpersistent/Makefile.am b/doc/nonpersistent/Makefile.am
index d8638f75..ce56885a 100644
--- a/doc/nonpersistent/Makefile.am
+++ b/doc/nonpersistent/Makefile.am
@@ -14,6 +14,7 @@ if SVN_CHECKOUT
 wiki.out/*:
 	test -n "$(WGET)" -a -n "$(SED)" -a -n "$(TR)" -a -n "$(XSLTPROC)"
 	WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \
+		PROJECT="@PACKAGE_NAME@" \
 		$(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(srcdir)/wiki.tmp"
 	mv wiki.tmp wiki.out
 
diff --git a/doc/nonpersistent/export-wiki.sh b/doc/nonpersistent/export-wiki.sh
index a9929c64..afe5bab0 100755
--- a/doc/nonpersistent/export-wiki.sh
+++ b/doc/nonpersistent/export-wiki.sh
@@ -8,23 +8,23 @@ test -z "$WGET_OPTS" && WGET_OPTS="$WGET_OPTS"
 test -z "$SED" && SED="sed"
 test -z "$TR" && TR="tr"
 
+test -z "$SERVER" && SERVER="http://www.opensc-project.org"
+test -z "$PROJECT" && PROJECT="opensc"
+
 SRCDIR=.
 OUTDIR=.
-
 test -n "$1" && SRCDIR="$1"
 test -n "$2" &&	OUTDIR="$2"
 
+WIKI="$PROJECT/wiki"
+XSL="$SRCDIR/export-wiki.xsl"
+
 test -f "$SRCDIR"/`basename $0`
 
 test -e "$OUTDIR" && rm -fr "$OUTDIR"
 
 mkdir "$OUTDIR" || exit 1
 
-export SERVER="http://www.opensc-project.org"
-export PROJECT="opensc"
-export WIKI="$PROJECT/wiki"
-export XSL="$SRCDIR/export-wiki.xsl"
-
 $WGET $WGET_OPTS $SERVER/$WIKI/TitleIndex -O "$OUTDIR"/TitleIndex.tmp
 
 $SED -e "s#</li>#</li>\n#g" < "$OUTDIR"/TitleIndex.tmp \