diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index 8d149bc..c0981af 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -555,8 +555,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   if test -f "${srcdir}/doc/plantuml.jar"; then
     PLANTUML="doc/plantuml.jar"
     AX_SUBST(PLANTUML)
-  else
-    AC_MSG_ERROR([NOT FOUND ac_top_srcdir=${ac_top_srcdir} top_srcdir=${top_srcdir} srcdir=${srcdir}])
   fi
   AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML")
   PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
@@ -587,6 +585,8 @@ doc: doxyfile @HAVE_PLANTUML_TRUE@ gen-uml-images
 	doxygen doxyfile
 @PEDANTIC_TRUE@	test \! -s doxygen.errors
 
+@HAVE_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
+@HAVE_PLANTUML_TRUE@
 @HAVE_PLANTUML_TRUE@gen-uml-images:
 @HAVE_PLANTUML_TRUE@	test -d gen-uml-images || mkdir gen-uml-images
 @HAVE_PLANTUML_TRUE@	eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e9f70d6..ad8259b 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1008,7 +1008,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyadd ALIASES '"readme=@README_HTML@"'
         doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"'
         if testtag AX_USE_PLANTUML; then
-            doxyadd ALIASES '"startuml{1}=\\image html \\1\\n\\image latex \\1\\n\\if DontIgnorePlantUMLCode"'
+            doxyadd ALIASES '"startuml{1}=@image html \\1\\n@image latex \\1\\n\\if DontIgnorePlantUMLCode"'
             doxyadd ALIASES '"enduml=\\endif"'
             doxyadd IMAGE_PATH '"gen-uml-images"'
         fi
@@ -1040,7 +1040,8 @@ if testtag AX_USE_DOXYGEN; then
         fi
         if testtag AX_USE_NODEJS; then
             doxyadd INPUT "@top_srcdir@/nodejs"
-            doxyreplace EXCLUDE "@top_srcdir@/nodejs/node_modules"
+            doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules"
+	    doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext"
         fi
         doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql'
         doxyreplace RECURSIVE YES