diff --git a/COPYING b/COPYING
index 28ecdc8..88798ab 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.16/COPYING
\ No newline at end of file
+/usr/share/automake-1.15/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index e3f22c0..ddcdb76 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.16/INSTALL
\ No newline at end of file
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index 4ab5d27..37a592b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1606,12 +1606,12 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
  -- @PACKAGER@  @BUILD_DATE@
 EOF
     RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)"
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, 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 | qt4-dev,"; fi)"
+    BUILD_DEPENDS="gnupg, debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, 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 | qt4-dev,"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: gpg, gpg-agent, ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Build-Depends: ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; else echo "@DEB_SECTION@"; fi)
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 383853d..dbe2522 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -264,7 +264,7 @@ case "$mode" in
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
             docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         if [[ "${img}" =~ "ubuntu" ]]; then
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales gnupg
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales
             docker exec ${DOCKER_ID} locale-gen ${LANG}
             docker exec ${DOCKER_ID} update-locale LANG=${LANG}
         fi
@@ -273,10 +273,13 @@ case "$mode" in
             docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
             docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
         done
-        for key in "${keys[@]}"; do
-            wget -O- "$key" \
-                | docker exec -i ${DOCKER_ID} apt-key add -
-        done
+        if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} gnupg
+            for key in "${keys[@]}"; do
+                wget -O- "$key" \
+                    | docker exec -i ${DOCKER_ID} apt-key add -
+            done
+        fi
         for repo in "${repos[@]}"; do
             ifthenelse "${repo}" "apt-add-repository 'ARG'"
         done