diff --git a/tools/niminst/buildsh.nimf b/tools/niminst/buildsh.nimf
index 7a05ef342f..6b99c49eeb 100644
--- a/tools/niminst/buildsh.nimf
+++ b/tools/niminst/buildsh.nimf
@@ -164,7 +164,7 @@ esac
 
 case $ucpu in
   *i386* | *i486* | *i586* | *i686* | *bepc* | *i86pc* )
-    if [ "$isOpenIndiana" = "yes" ] ; then
+    if [ "$isOpenIndiana" = "yes" ] || [ `uname -o` == "illumos" ] ; then
       mycpu="amd64"
     else
       mycpu="i386"