diff --git a/ChangeLog b/ChangeLog
index 63be8ee..71b7e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-02  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Drop detection for i386-pc-linux-gnuoldld on
+	systems with a pre-BFD linker.  "Here's a nickel, kid .."
+
 2009-06-01  Ben Elliston  <bje@gnu.org>
 
 	Reported by bob.strahan@hp.com.
diff --git a/config.guess b/config.guess
index 35888aa..ea3c8f3 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2009-05-31'
+timestamp='2009-06-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1007,11 +1007,6 @@ EOF
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build