diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 84b7c28fa2..a12e133e53 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -149,8 +149,8 @@ AC_DEFUN([ZFS_AC_SPL], [
 	AC_MSG_RESULT([$splsrcver])
 
 	AC_MSG_CHECKING([spl Module.symvers])
-	if test -r $splbuild/modules/Module.symvers; then
-		splsymvers=$splbuild/modules/Module.symvers
+	if test -r $splbuild/module/Module.symvers; then
+		splsymvers=$splbuild/module/Module.symvers
 	elif test -r $kernelbuild/Module.symvers; then
 		splsymvers=$kernelbuild/Module.symvers
 	fi
diff --git a/scripts/zfs.sh b/scripts/zfs.sh
index 858e3376ae..d1457c84ca 100755
--- a/scripts/zfs.sh
+++ b/scripts/zfs.sh
@@ -14,7 +14,7 @@ kernel_modules=(				\
 )
 
 spl_modules=(					\
-	${SPLBUILD}/modules/spl/spl.ko		\
+	${SPLBUILD}/module/spl/spl.ko		\
 )
 
 zfs_modules=(					\