diff --git a/ChangeLog b/ChangeLog
index 80b52b8..17558d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-23  Bruno Haible  <haible@clisp.cons.org>
+
+        * autoconf/aclocal.m4 (CL_CANONICAL_HOST): Determine host_cpu,
+          host_vendor, host_os correctly if $host has more than two hyphens.
+
 2000-05-19  Richard Kreckel  <kreckel@ginac.de>
 
         * src/base/digitseq/cl_DS_mul.cc: Rearranged break-even points to
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 2042cf7..e558f58 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -234,9 +234,9 @@ fi
 cl_cv_host="$host"
 ])
 host="$cl_cv_host"
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 AC_SUBST(host)dnl
 AC_SUBST(host_cpu)dnl
 AC_SUBST(host_vendor)dnl