--- Config.kmk
+++ Config.kmk
@@ -861,7 +861,7 @@
 # We need to export YASM for OSE, but since it was converted to .zip we need to
 # allow for the location used by the zip to be properly cleaned up first.
 if1of ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),  win.x86 linux.x86 solaris.x86)
- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
+ PATH_TOOL_YASM ?= /usr/bin
 endif
 
 # XPCOM setup for all but win32.
--- configure
+++ configure
@@ -468,8 +468,8 @@
       yasm_min=`echo $yasm_ver|cut -d. -f2`
       yasm_rev=`echo $yasm_ver|cut -d. -f3`
       yasm_ver_mul=`expr $yasm_maj \* 10000 + $yasm_min \* 100 + $yasm_rev`
-      if [ $yasm_ver_mul -lt 501 ]; then
-        log_failure "found version $yasm_ver, expected at least 0.5.1"
+      if [ $yasm_ver_mul -lt 600 ]; then
+        log_failure "found version $yasm_ver, expected at least 0.6.0"
         fail
       else
         log_success "found version $yasm_ver"
@@ -1503,7 +1503,7 @@
 [ "$OS" != "darwin"  ] && check_bcc
 [ "$OS" != "darwin"  ] && check_iasl
 # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
-# [ "$OS" != "darwin" ] && check_yasm
+[ "$OS" != "darwin" ] && check_yasm
 [ "$OS" != "darwin"  ] && check_xsltproc
 [ $OSE -eq 0 ]         && check_mkisofs