:: commit d4ffe99b4248ab3c78ab54875a49714af7098b8c

diff --git a/bootstrap b/bootstrap
index 7cca6862..7cfc838c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,6 +29,8 @@ fi
 AUTOMAKE_LIBDIR="$(automake --print-libdir)"
 cp "${AUTOMAKE_LIBDIR}/INSTALL" ./
 mkdir -p build-aux
+cp "${AUTOMAKE_LIBDIR}/config.guess" build-aux/
+cp "${AUTOMAKE_LIBDIR}/config.sub" build-aux/
 cp "${AUTOMAKE_LIBDIR}/install-sh" build-aux/
 
 autoreconf -fvi -Wall
diff --git a/configure.ac b/configure.ac
index 5b20b631..876901d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ AC_SUBST([BUILDDIR])
 REGEN_DATE="m4_esyscmd([date '+%B %Y' | tr -d '\n'])"
 AC_SUBST([REGEN_DATE])
 
+AC_CANONICAL_HOST
+
 AC_DEFUN([PROG_ABSPATH], [
     case "$$1" in
         .*) $1="$(cd "$(dirname "$$1")" && pwd -P)/$(basename "$$1")" ;;