diff --git a/MANIFEST b/MANIFEST
index c842cd997f..3400a2f5d6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -48,7 +48,7 @@
 ./config/hpux9.03
 ./config/intel-osf1
 ./config/irix5.3
-./config/irix6.2
+./config/irix6.x
 ./config/irix64
 ./config/linux
 ./config/powerpc-ibm-aix4.2.1.0
diff --git a/bin/config.guess b/bin/config.guess
index 03f0dcd21a..c036193f76 100755
--- a/bin/config.guess
+++ b/bin/config.guess
@@ -150,9 +150,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
 	exit 0 ;;
-    *:IRIX64:*:*)
+    *:IRIX64:*:*)		# IRIX64 all versions
 	echo mips-sgi-irix64
 	exit 0 ;;
+    *:IRIX*:6.*:*)		# IRIX all 6.x versions
+	echo mips-sgi-irix6.x
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
diff --git a/config/irix6.2 b/config/irix6.x
similarity index 100%
rename from config/irix6.2
rename to config/irix6.x