diff --git a/configure.in b/configure.in
index 815dbb22151..d6345762974 100644
--- a/configure.in
+++ b/configure.in
@@ -797,11 +797,17 @@ case "${canonical}" in
   ;;
 
   ## PowerPC reference platform
-  powerpcle-*-solaris2* )
+  powerpcle-*-solaris2.5* )
     machine=prep
     opsys=sol2-5
   ;;
 
+  ## PowerPC reference platform
+  powerpcle-*-solaris2* )
+    machine=prep
+    opsys=sol2-6
+  ;;
+
   ## Pyramid machines
   ## I don't really have any idea what sort of processor the Pyramid has,
   ## so I'm assuming it is its own architecture.
@@ -941,8 +947,13 @@ case "${canonical}" in
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		RANLIB="ar -ts"
 		;;
+      *-sunos5.6* | *-solaris2.6* )
+		opsys=sol2-6
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
       *-sunos5* | *-solaris* )
-		opsys=sol2-5
+		opsys=sol2-6
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
       *			  ) opsys=bsd4-2   ;;