diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index f26375d1a3ecd800bef2826c8570098012880be4..83b3a1e75370712e1e24691ada76000c9fd2eae3 100644
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -209,9 +209,9 @@ LB_LINUX_RELEASE
 AC_DEFUN([LB_LINUX_MODPOST],
 [
 # Find the modpost utility
-AC_CHECK_FILE([$LINUX_OBJ/scripts/mod/modpost],
+LB_CHECK_FILE([$LINUX_OBJ/scripts/mod/modpost],
 	[MODPOST=$LINUX_OBJ/scripts/mod/modpost],
-	[AC_CHECK_FILE([$LINUX_OBJ/scripts/modpost],
+	[LB_CHECK_FILE([$LINUX_OBJ/scripts/modpost],
 		[MODPOST=$LINUX_OBJ/scripts/modpost],
 		AC_MSG_ERROR([modpost not found.])
 	)]
diff --git a/libsysio/config.sub b/libsysio/config.sub
index 1f31816b97a13e14c63f276bea226a8dde6887b5..d25938e5ecbb5fae7a488b3691ced32cebcef2af 100755
--- a/libsysio/config.sub
+++ b/libsysio/config.sub
@@ -299,7 +299,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \