diff --git a/build-support/factor.sh b/build-support/factor.sh
index 16ab260df5..cdb2a87bba 100755
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -175,6 +175,7 @@ find_os() {
         *FreeBSD*) OS=freebsd;;
         *OpenBSD*) OS=openbsd;;
         *DragonFly*) OS=dragonflybsd;;
+	SunOS) OS=solaris;;
     esac
 }
 
@@ -186,6 +187,7 @@ find_architecture() {
     case $uname_m in
        i386) ARCH=x86;;
        i686) ARCH=x86;;
+       i86pc) ARCH=x86;;
        amd64) ARCH=x86;;
        ppc64) ARCH=ppc;;
        *86) ARCH=x86;;
@@ -261,6 +263,7 @@ check_os_arch_word() {
         $ECHO "ARCH: $ARCH"
         $ECHO "WORD: $WORD"
         $ECHO "OS, ARCH, or WORD is empty.  Please report this."
+	echo $MAKE_TARGET
         exit 5
     fi
 }
@@ -486,6 +489,8 @@ usage() {
     echo "    $0 update macosx-x86-32"
 }
 
+MAKE_TARGET=unknown
+
 # -n is nonzero length, -z is zero length
 if [[ -n "$2" ]] ; then
     parse_build_info $2