diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 85aeebf9e78cc54da44a3e3b57e928c6809934c5..7e06d24f65aff170153f41c7fd14839d53ac9aea 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,6 +37,8 @@ tbd Sun Microsystems, Inc.
 	  For more information, please refer to bugzilla 13904.
 	* Output of lfs quota has been made less detailed by default,
 	  old (verbose) output can be obtained by using -v option.
+	* File join has been disabled in this release, refer to Bugzilla
+	  16929.
 
 Severity   : enhancement
 Bugzilla   : 15966
@@ -187,7 +189,7 @@ Description: Add lustre_start utility to start or stop multiple Lustre servers
 Severity   : minor
 Bugzilla   : 15899
 Description: Add support for downgrading pools-striped files
-Details    : This version can understand the new LOV magic from pools 
+Details    : This version can understand the new LOV magic from pools
 	     striped files (pools will be available in a future release).
 
 Severity   : normal
diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 1b0df577b6f58727a79a73626b6bb2ccf089b615..9e3e56b9cc2155b5450217428ea3354a3ed43ebe 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2625,6 +2625,8 @@ error:
         case EXT3_IOC_GETVERSION:
                 RETURN(put_user(inode->i_generation, (int *)arg));
         case LL_IOC_JOIN: {
+#if LUSTRE_FIX >= 50
+                /* Allow file join in beta builds to allow debuggging */
                 char *ftail;
                 int rc;
 
@@ -2634,6 +2636,10 @@ error:
                 rc = ll_file_join(inode, file, ftail);
                 putname(ftail);
                 RETURN(rc);
+#else
+                CWARN("file join is not supported in this version of Lustre\n");
+                RETURN(-ENOTTY);
+#endif
         }
         case LL_IOC_GROUP_LOCK:
                 RETURN(ll_get_grouplock(inode, file, arg));
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 79bcd196b05ab9327d235ec14d0981d26d67137b..d1a58c400d05f49fc954063719bc3a23e1234167 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:  3192 12652  15528/3811 9977  15528/11549
-ALWAYS_EXCEPT="                 14b  14c    19         28    29           $SANITYN_EXCEPT"
+# bug number for skipped test: 3192 12652 15528/3811 16929 9977 15528/11549
+ALWAYS_EXCEPT="                14b  14c   19         22    28   29           $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # bug number for skipped test:                                                    12652 12652