diff --git a/ChangeLog b/ChangeLog
index 1472c29..11b441b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.sh: Incorporate uname.in as a heredoc.
+	* testsuite/uname.in: Remove.
+
 2012-07-29  Ben Elliston  <bje@gnu.org>
 
 	* uname: Remove.
diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh
index 85a8056..31af43c 100644
--- a/testsuite/config-guess.sh
+++ b/testsuite/config-guess.sh
@@ -17,7 +17,14 @@ run_config_guess ()
 	    -e "s,@MACHINE@,$machine," \
 	    -e "s,@RELEASE@,$release," \
 	    -e "s,@SYSTEM@,$system," \
-	    -e "s,@VERSION@,$version," < uname.in > uname
+	    -e "s,@VERSION@,$version," > uname << EOF
+[ \$# -ne 1 ] && exec sh \$0 -s
+[ \$1 = -m ] && echo "@MACHINE@" && exit 0
+[ \$1 = -r ] && echo "@RELEASE@" && exit 0
+[ \$1 = -s ] && echo "@SYSTEM@" && exit 0
+[ \$1 = -v ] && echo "@VERSION@" && exit 0
+[ \$1 = -p ] && echo "Pentium III(TM)-ISA/PCI"
+EOF
 	chmod +x uname
 	output=`sh ../config.guess 2>/dev/null`
 	if test $? != 0 ; then
diff --git a/testsuite/uname.in b/testsuite/uname.in
deleted file mode 100755
index d44d15f..0000000
--- a/testsuite/uname.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# uname(1) simulator, inspired by Pavel Roskin.
-
-[ $# -ne 1 ] && exec sh $0 -s
-[ $1 = -m ] && echo "@MACHINE@" && exit 0
-[ $1 = -r ] && echo "@RELEASE@" && exit 0
-[ $1 = -s ] && echo "@SYSTEM@" && exit 0
-[ $1 = -v ] && echo "@VERSION@" && exit 0
-[ $1 = -p ] && echo "Pentium III(TM)-ISA/PCI"