diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 4f63768..5f3b703 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -599,7 +599,7 @@ doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
 
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
-	@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
+	@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images doxygen_sqlite3.db
 distclean-documentation:
 	-rm -r html
 	-rm  @PACKAGE_NAME@.doxytag
diff --git a/bootstrap.sh b/bootstrap.sh
index 0c4a069..f8382b9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1100,7 +1100,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_PLANTUML; then echo -n ", default-jre-headless|default-jre"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -1173,14 +1173,11 @@ Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
     if testtag AX_USE_DOXYGEN; then
-      echo -n ", doxygen";
+      echo -n ", doxygen, default-jre-headless";
     fi
     if testtag AX_USE_PERLDOC; then
       echo -n ", libpod-tree-perl";
     fi
-    if testtag AX_USE_PLANTUML; then
-      echo -n ", default-jre-headless";
-    fi
 )
 %if 0%{?fedora} != 20
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 674ff2c..49abaf7 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -6,7 +6,7 @@ mode="apt"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=()
+envs=("-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 dirs=("-v $(pwd):/workdir")
 packages=()
 targets="all check distcheck"