diff --git a/ChangeLog b/ChangeLog
index 31870cde9de29df09d00538663e3c23e30fca6c3..14493f07fa858618977bac52e8394f6dfd1d93e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 10 21:50:01 1999  Philipp Thomas  (kthomas@gwdg.de)
+
+	* config.sub: Set basic_machine to i586 when target_alias = k6-*.
+
 Fri Apr  2 15:11:32 1999  H.J. Lu  (hjl@gnu.org)
 
 	* configure (gxx_include_dir): Removed.
diff --git a/config.sub b/config.sub
index 4f442ec3f7867511b962798f02e16a92636989b6..3bb8d2ce499899109bc4a65467daba463c009b10 100755
--- a/config.sub
+++ b/config.sub
@@ -641,19 +641,19 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)