diff --git a/config/spl-build.m4 b/config/spl-build.m4
index eee9a783f7..a528e0f63c 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -115,8 +115,10 @@ AC_DEFUN([SPL_AC_KERNEL], [
 	AC_MSG_RESULT([$kernelsrc])
 	AC_MSG_CHECKING([kernel build directory])
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else
diff --git a/configure b/configure
index 93713e5a42..0297a07af3 100755
--- a/configure
+++ b/configure
@@ -18997,8 +18997,10 @@ echo "${ECHO_T}$kernelsrc" >&6
 	echo "$as_me:$LINENO: checking kernel build directory" >&5
 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else
@@ -21388,8 +21390,10 @@ echo "${ECHO_T}$kernelsrc" >&6
 	echo "$as_me:$LINENO: checking kernel build directory" >&5
 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else