diff --git a/ChangeLog b/ChangeLog
index bc50420..219e215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.guess (pc:*:*:*): Return i586-pc-msdosdjgpp, for
+	consistency with config.sub.
+
 2009-04-17  Anthony Green  <green@moxielogic.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index e5716ee..3eda297 100755
--- a/config.guess
+++ b/config.guess
@@ -1115,8 +1115,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 9090a9a..514a5ad 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -40,3 +40,4 @@ padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu
 ppc	2.6.9-22		Linux		ignored	powerpc-unknown-linux-gnu
 i686	5.11-686		GNU/kOpenSolaris	ignored	i686-unknown-kopensolaris5.11-gnu
 i386	12.1			AROS		ignored	i386-pc-aros
+pc	1.0			ignored		ignored	i586-pc-msdosdjgpp