diff -Naur Lustre-1.5.95/configure lustre-1.5.95/configure
--- Lustre-1.5.95/configure	2007-01-12 08:15:35.000000000 -0600
+++ lustre-1.5.95/configure	2007-01-26 08:31:54.000000000 -0600
@@ -3561,9 +3561,8 @@
 
 
 # mount.lustre
-#rootsbindir='/sbin'
-rootsbindir='$(sbindir)'
 
+rootsbindir='${exec_prefix}/sbin'
 
 demodir='$(docdir)/demo'
 
diff -Naur Lustre-1.5.95/home/tsnider/super.cPatch lustre-1.5.95/home/tsnider/super.cPatch
--- Lustre-1.5.95/home/tsnider/super.cPatch	2007-01-11 15:26:12.000000000 -0600
+++ lustre-1.5.95/home/tsnider/super.cPatch	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- lustre-1.5.95/lustre/ldiskfs/super.c-	2006-11-01 23:32:05.000000000 +0200
-+++ lustre-1.5.95/lustre/ldiskfs/super.c	2006-11-01 23:32:31.000000000 +0200
-@@ -19,7 +19,8 @@
- #include <linux/module.h>
- #include <linux/string.h>
- #include <linux/fs.h>
-+#include <linux/utsname.h>
-+#include <linux/utsname.h1>
- #include <linux/time.h>
- #include <linux/jbd.h>
- #include <linux/ext3_fs.h>
diff -Naur Lustre-1.5.95/lustre/include/linux/lustre_types.h lustre-1.5.95/lustre/include/linux/lustre_types.h
--- Lustre-1.5.95/lustre/include/linux/lustre_types.h	2006-08-07 18:01:35.000000000 -0500
+++ lustre-1.5.95/lustre/include/linux/lustre_types.h	2007-01-15 07:36:53.000000000 -0600
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef __KERNEL__
-# include <linux/types.h>
+/*# include <linux/types.h> */
 # include <linux/fs.h>    /* to check for FMODE_EXEC, dev_t, lest we redefine */
 #else
 #ifdef __CYGWIN__
diff -Naur Lustre-1.5.95/lustre/include/lustre/lustre_idl.h lustre-1.5.95/lustre/include/lustre/lustre_idl.h
--- Lustre-1.5.95/lustre/include/lustre/lustre_idl.h	2006-09-01 00:39:39.000000000 -0500
+++ lustre-1.5.95/lustre/include/lustre/lustre_idl.h	2007-01-15 07:43:39.000000000 -0600
@@ -36,7 +36,7 @@
 #include <libcfs/kp30.h>
 
 #if defined(__linux__)
-#include <linux/lustre_types.h>
+/*#include <linux/lustre_types.h>*/
 #elif defined(__APPLE__)
 #include <darwin/lustre_types.h>
 #elif defined(__WINNT__)
diff -Naur Lustre-1.5.95/lustre/kernel_patches/patches/ext3-utsname-2.6.18-vanilla.patch lustre-1.5.95/lustre/kernel_patches/patches/ext3-utsname-2.6.18-vanilla.patch
--- Lustre-1.5.95/lustre/kernel_patches/patches/ext3-utsname-2.6.18-vanilla.patch	2007-01-12 08:48:23.000000000 -0600
+++ lustre-1.5.95/lustre/kernel_patches/patches/ext3-utsname-2.6.18-vanilla.patch	2007-01-12 14:47:55.000000000 -0600
@@ -1,7 +1,5 @@
-Index: linux-stage/fs/ext3/super.c
-===================================================================
---- linux-stage.orig/fs/ext3/super.c	2006-07-16 02:29:43.000000000 +0800
-+++ linux-stage/fs/ext3/super.c	2006-07-16 02:29:49.000000000 +0800
+--- linux-2.6.18/fs/ext3/super.c-	2006-11-01 23:32:05.000000000 +0200
++++ linux-2.6.18/fs/ext3/super.c	2006-11-01 23:32:31.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/module.h>
  #include <linux/string.h>
diff -Naur Lustre-1.5.95/lustre/llite/super.c lustre-1.5.95/lustre/llite/super.c
--- Lustre-1.5.95/lustre/llite/super.c	2006-09-01 00:39:40.000000000 -0500
+++ lustre-1.5.95/lustre/llite/super.c	2007-01-17 14:01:43.000000000 -0600
@@ -32,6 +32,7 @@
 #include <lustre_dlm.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/utsname.h>
 #include <linux/random.h>
 #include <linux/cache_def.h>
 #include <lprocfs_status.h>
diff -Naur Lustre-1.5.95/lustre/utils/llverfs.c lustre-1.5.95/lustre/utils/llverfs.c
--- Lustre-1.5.95/lustre/utils/llverfs.c	2006-06-11 11:54:36.000000000 -0500
+++ lustre-1.5.95/lustre/utils/llverfs.c	2007-01-23 15:22:48.000000000 -0600
@@ -462,7 +462,7 @@
 	FILE *countfile = NULL;
 	char filecount[PATH_MAX];
 	unsigned long dir_num = 0, dir_num_orig = 0;/* starting directory */
-	char c;
+	long c;
 
 	progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
 	while ((c = (char)getopt_long(argc, argv, "t:rwvplo:h",
diff -Naur Lustre-1.5.95/lustre/utils/mkfs_lustre.c lustre-1.5.95/lustre/utils/mkfs_lustre.c
--- Lustre-1.5.95/lustre/utils/mkfs_lustre.c	2006-09-06 17:00:21.000000000 -0500
+++ lustre-1.5.95/lustre/utils/mkfs_lustre.c	2007-01-24 07:31:07.000000000 -0600
@@ -968,11 +968,6  @@
                 {0, 0, 0, 0}
         };
         char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:Pqru:vw";
-        char opt;
+        long opt;
         int rc, longidx;