diff --git a/aclocal/canonical-host.m4 b/aclocal/canonical-host.m4
index 8efddbb7c8..cba8e05a54 100644
--- a/aclocal/canonical-host.m4
+++ b/aclocal/canonical-host.m4
@@ -7,7 +7,7 @@ RTEMS_HOST=$host_os
 changequote(,)dnl
 case "${target}" in
   # hpux unix port should go here
-  i[3456]86-pc-linux*)          # unix "simulator" port
+  i[3456]86-*linux*)          # unix "simulator" port
         RTEMS_HOST=Linux
 	;;
   i[3456]86-*freebsd2*)         # unix "simulator" port
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index 93d16ce6f8..5aa4d6b7dd 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -15,7 +15,7 @@ AC_MSG_CHECKING(rtems target cpu)
 changequote(,)dnl
 case "${target}" in
   # hpux unix port should go here
-  i[3456]86-pc-linux*)		# unix "simulator" port
+  i[3456]86-*linux*)		# unix "simulator" port
 	RTEMS_CPU=unix
 	;;
   i[3456]86-*freebsd2*) 	# unix "simulator" port