Index: client/lib/teapotclient0.1/teapotclient.tcl
==================================================================
--- client/lib/teapotclient0.1/teapotclient.tcl
+++ client/lib/teapotclient0.1/teapotclient.tcl
@@ -73,15 +73,15 @@
 
         # Conversions from Teapot-style names to local ones
 	set osTeapotToLocal(tcl) [list *]
 	set osTeapotToLocal(linux-*) [list linux]
 	set osTeapotToLocal(win32) [list windows]
-	set osTeapotToLocal(solaris*) [list solaris]
+	set osTeapotToLocal(solaris*) [list solaris sunos]
 	set osTeapotToLocal(freebsd) [list freebsd_*]
 	set osTeapotToLocal(irix) [list irix_*]
 
-	set cpuTeapotToLocal(ix86) [list x86 intel i?86]
+	set cpuTeapotToLocal(ix86) [list x86 intel i?86 i86pc]
 	set cpuTeapotToLocal(sparc) [list sun4*]
 	set cpuTeapotToLocal(universal) [list *]
 	set cpuTeapotToLocal(powerpc) [list ppc]
 
 	proc download_extensions {rootdir servers extensions os cpu {existingExts ""}} {