diff --git a/classes/java.bbclass b/classes/java.bbclass
index 6a45065..fe24648 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -39,7 +39,7 @@ oe_jarinstall() {
       destname=$1
       ;;
     -*)
-      oefatal "oe_jarinstall: unknown option: $1"
+      bbfatal "oe_jarinstall: unknown option: $1"
       ;;
     *)
       break;
@@ -105,7 +105,7 @@ oe_makeclasspath() {
               fi
               ;;
           -*)
-              oefatal "oe_makeclasspath: unknown option: $1"
+              bbfatal "oe_makeclasspath: unknown option: $1"
               ;;
           *)
               file=$dir/$1.jar
@@ -146,7 +146,7 @@ oe_java_simple_wrapper() {
       output=$1
       ;;
     -*)
-      oefatal "oe_java_simple_wrapper: unknown option: $1"
+      bbfatal "oe_java_simple_wrapper: unknown option: $1"
       ;;
     *)
       if [ $mainclass ]
diff --git a/recipes-core/llvm/llvm.inc b/recipes-core/llvm/llvm.inc
index c675c4d..5cc9957 100644
--- a/recipes-core/llvm/llvm.inc
+++ b/recipes-core/llvm/llvm.inc
@@ -208,7 +208,7 @@ def get_llvm_arch(d):
   elif arch == "powerpc":
     arch = "PowerPC"
   else:
-    oefatal("Your target architecture is not supported by this recipe");
+    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
 
   return arch
 
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 1a3c52b..461ccd9 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -158,7 +158,7 @@ def get_llvm_configure_arch(d):
   elif arch == "powerpc":
     arch = "powerpc"
   else:
-    oefatal("Your target architecture is not supported by this recipe");
+    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
 
   return arch