diff --git a/BaseTools/BinWrappers/NetBSD-amd64 b/BaseTools/BinWrappers/NetBSD-amd64
index e69de29..6de8e47 120000
--- a/BaseTools/BinWrappers/NetBSD-amd64
+++ b/BaseTools/BinWrappers/NetBSD-amd64
@@ -0,0 +1 @@
+PosixLike
\ No newline at end of file
diff --git a/BaseTools/BinWrappers/NetBSD-i386 b/BaseTools/BinWrappers/NetBSD-i386
index e69de29..6de8e47 120000
--- a/BaseTools/BinWrappers/NetBSD-i386
+++ b/BaseTools/BinWrappers/NetBSD-i386
@@ -0,0 +1 @@
+PosixLike
\ No newline at end of file
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index ca8a578..24d08fd 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
@@ -141,6 +142,8 @@ GetBaseToolsBinSubDir() {
   UNAME_DIRNAME=`uname -sm`
   UNAME_DIRNAME=${UNAME_DIRNAME// /-}
   UNAME_DIRNAME=${UNAME_DIRNAME//\//-}
+  UNAME_DIRNAME=${UNAME_DIRNAME//Linux-i?86/Linux-i686}
+  UNAME_DIRNAME=${UNAME_DIRNAME//Linux-i86pc/Linux-i686}
   echo $UNAME_DIRNAME
 }