diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index c0981af..f72bd88 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -545,6 +545,11 @@ AC_DEFUN([AX_USE_SCRIPTS], [
 
 # use this in configure.ac to support PlantUML in Doxygen generation
 AC_DEFUN([AX_USE_PLANTUML], [
+  if test -f "${srcdir}/doc/plantuml.jar"; then
+    PLANTUML="doc/plantuml.jar"
+    AX_SUBST(PLANTUML)
+  fi
+  AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML")
 ])
 
 # use this in configure.ac to support Doxygen documentation generation
@@ -552,11 +557,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
   AC_CHECK_PROG(have_dot, dot, yes, no)
   AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
-  if test -f "${srcdir}/doc/plantuml.jar"; then
-    PLANTUML="doc/plantuml.jar"
-    AX_SUBST(PLANTUML)
-  fi
-  AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML")
   PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
   AC_SUBST(PDF_DOC)
   if test "$have_doxygen" = "no"; then
@@ -581,21 +581,10 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
   test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
-doc: doxyfile @HAVE_PLANTUML_TRUE@ gen-uml-images
+doc: doxyfile
 	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); \\
-@HAVE_PLANTUML_TRUE@	eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
-@HAVE_PLANTUML_TRUE@	SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
-@HAVE_PLANTUML_TRUE@	for src in \$\$INPUT; do \\
-@HAVE_PLANTUML_TRUE@	  java  -Djava.awt.headless=true -jar \${top_srcdir}/\${PLANTUML} -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
-@HAVE_PLANTUML_TRUE@	done
-
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
 distclean-documentation:
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ad8259b..3a316e2 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1008,9 +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 '"enduml=\\endif"'
-            doxyadd IMAGE_PATH '"gen-uml-images"'
+            doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/@PLANTUML@"'
         fi
         doxyreplace ENABLE_PREPROCESSING YES
         doxyreplace MACRO_EXPANSION YES