diff --git a/ChangeLog b/ChangeLog
index 0d2afac9ff..0135372a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Fri Dec 13 01:17:06 1991  K. Richard Pixley  (rich at cygnus.com)
 
+	* configure: find config.subr again now that configuration "none"
+	  has gone.
+
 	* config.subr: resync from rms.
 
 Wed Dec 11 22:25:20 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
diff --git a/configure b/configure
index d764560875..a7c5e5985d 100755
--- a/configure
+++ b/configure
@@ -117,15 +117,6 @@ else
 	PATH=$PATH:${PWD} ; export PATH
 fi
 
-configsubr=`echo ${progname} | sed 's/configure$/config.subr/'`
-
-if ${configsubr} none >/dev/null 2>&1 ; then
-	true
-else
-	echo '***' cannot find config.subr.
-	echo 1
-fi
-
 for arg in $*;
 do
 	# handle things that might have args following as separate words
@@ -363,6 +354,15 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
 	exit 1
 fi
 
+configsubr=`echo ${progname} | sed 's/configure$/config.subr/'`
+
+if (${configsubr} `echo ${hosts} | sed -e 's/ .*//'`) >/dev/null 2>&1 ; then
+	true
+else
+	echo '***' cannot find config.subr.
+	exit 1
+fi
+
 if [ -z "${srcdir}" ] ; then
 	if [ -r configure.in ] ; then
 		srcdir=.