Index: /branches/Orange-Branch/configure
===================================================================
--- /branches/Orange-Branch/configure	(revision 9022)
+++ /branches/Orange-Branch/configure	(revision 9024)
@@ -5785,6 +5785,9 @@
     elif test -r  $withval/include/generated/utsrelease.h && grep -q UTS_RELEASE..2\\.6\\. $withval/include/generated/utsrelease.h; then
         vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h`
+    elif test -r  $withval/include/generated/utsrelease.h && grep -qE UTS_RELEASE..3\\. $withval/include/generated/utsrelease.h; then
+        vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h`
     else
-        as_fn_error $? "The kernel source tree does not appear to be 2.6" "$LINENO" 5
+        as_fn_error $? "The kernel source tree does not appear to be 2.6 or 3.X" "$LINENO" 5
+
     fi
 
@@ -13158,9 +13161,9 @@
 
 if test "x$LINUX_KERNEL_SRC" = "x" -a "x$BUILD_BMI_ONLY" != "x1"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6.x kernel module      :  no" >&5
-$as_echo "PVFS2 configured for the 2.6.x kernel module      :  no" >&6; }
-else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6.x kernel module      : yes" >&5
-$as_echo "PVFS2 configured for the 2.6.x kernel module      : yes" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6/3 kernel module      :  no" >&5
+$as_echo "PVFS2 configured for the 2.6/3 kernel module      :  no" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6/3 kernel module      : yes" >&5
+$as_echo "PVFS2 configured for the 2.6/3 kernel module      : yes" >&6; }
 fi
 
Index: /branches/Orange-Branch/configure.in
===================================================================
--- /branches/Orange-Branch/configure.in	(revision 8794)
+++ /branches/Orange-Branch/configure.in	(revision 9024)
@@ -534,6 +534,9 @@
     elif test -r  $withval/include/generated/utsrelease.h && grep -q UTS_RELEASE..2\\.6\\. $withval/include/generated/utsrelease.h; then
         vers=`sed -n '/UTS_RELEASE/{; s/.*"\([0-9]\.[0-9]\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h`
+    elif test -r  $withval/include/generated/utsrelease.h && grep -qE UTS_RELEASE..3\\. $withval/include/generated/utsrelease.h; then
+        vers=`sed -n '/UTS_RELEASE/{; s/.*"\([0-9]\.[0-9]\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h`
     else
-        AC_MSG_ERROR(The kernel source tree does not appear to be 2.6)
+        AC_MSG_ERROR(The kernel source tree does not appear to be 2.6 or 3.X)
+        
     fi
 
@@ -1225,7 +1228,7 @@
 
 if test "x$LINUX_KERNEL_SRC" = "x" -a "x$BUILD_BMI_ONLY" != "x1"; then
-   AC_MSG_RESULT([PVFS2 configured for the 2.6.x kernel module      :  no])
-else
-   AC_MSG_RESULT([PVFS2 configured for the 2.6.x kernel module      : yes])
+   AC_MSG_RESULT([PVFS2 configured for the 2.6/3 kernel module      :  no])
+else
+   AC_MSG_RESULT([PVFS2 configured for the 2.6/3 kernel module      : yes])
 fi