diff --git a/INSTALL b/INSTALL
index 6066fddc4..cf0dc05ac 100644
--- a/INSTALL
+++ b/INSTALL
@@ -120,9 +120,7 @@
      number in your message.
 
      [If you encounter assembler error messages, try the "no-asm"
-     configuration option as an immediate fix.  Note that on Solaris x86
-     (not on Sparcs!) you may have to install the GNU assembler to use
-     OpenSSL assembler code -- /usr/ccs/bin/as won't do.]
+     configuration option as an immediate fix.]
 
      Compiling parts of OpenSSL with gcc and others with the system
      compiler will result in unresolved symbols on some systems.
diff --git a/config b/config
index 93e2317c3..969c94d2b 100755
--- a/config
+++ b/config
@@ -438,6 +438,14 @@ then
   sleep 5
   OUT=linux-sparcv8
 fi
+if [ "$OUT" = "i86pc-sun-solaris2" ]
+then
+  ASM=`as -V /dev/null`
+  case "$ASM" in
+    GNU*) ;;
+    *) options="$options no-asm" ; echo "WARNING: You need the GNU assembler to use OpenSSL assembler code." ; echo "Sun as is not supported on Solaris x86." ;;
+  esac
+fi
 
 case "$GUESSOS" in
   i386-*) options="$options 386" ;;