Index: amd/conf_tok.l
--- amd/conf_tok.l.orig	2006-01-02 19:40:31 +0100
+++ amd/conf_tok.l	2007-12-22 16:24:15 +0100
@@ -109,9 +109,6 @@
 /* no need to use yyunput() */
 %option nounput
 
-/* allocate more output slots so lex scanners don't run out of mem */
-%o 1024
-
 DIGIT		[0-9]
 ALPHA		[A-Za-z]
 ALPHANUM	[A-Za-z0-9]
Index: conf/mount/mount_linux.c
--- conf/mount/mount_linux.c.orig	2005-10-06 20:37:49 +0200
+++ conf/mount/mount_linux.c	2005-10-11 08:34:46 +0200
@@ -49,7 +49,9 @@
 #endif /* HAVE_CONFIG_H */
 #include <am_defs.h>
 #include <amu.h>
-
+#ifndef NFS_MOUNT_VERSION
+#define NFS_MOUNT_VERSION 4
+#endif /* NFS_MOUNT_VERSION */
 
 #ifndef MOUNT_TYPE_UFS
 /*
Index: config.h.in
--- config.h.in.orig	2005-10-10 19:06:16 +0200
+++ config.h.in	2005-10-11 08:34:46 +0200
@@ -162,6 +162,9 @@
 /* Define to 1 if you have the <db1/ndbm.h> header file. */
 #undef HAVE_DB1_NDBM_H
 
+/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
+#undef HAVE_GDBM_NDBM_H
+
 /* Define to 1 if you have the `dbm_open' function. */
 #undef HAVE_DBM_OPEN
 
@@ -730,6 +733,9 @@
 /* Define to 1 if you have the <nfs/nfs.h> header file. */
 #undef HAVE_NFS_NFS_H
 
+/* Define if you have the <nfsclient/nfs.h> header file. */
+#undef HAVE_NFSCLIENT_NFS_H
+
 /* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
 #undef HAVE_NFS_NFS_MOUNT_H
 
Index: configure
--- configure.orig	2005-10-10 19:06:13 +0200
+++ configure	2005-10-11 08:36:26 +0200
@@ -20871,7 +20871,7 @@
 				;;
 		esac
 		;;
-	sunos[34]* | solaris1* | solaris2.[0-5] | sunos5.[0-5] | solaris2.5.* | sunos5.5.* )
+ 	sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* )
 		ac_cv_os_cflags="" ;;
 	solaris2* | sunos5* )
 		# turn on 64-bit file offset interface
@@ -25004,6 +25004,7 @@
 	nfs/export.h			\
 	nfs/mount.h			\
 	nfs/nfs.h			\
+	nfsclient/nfs.h			\
 	nfs/nfs_clnt.h			\
 	nfs/nfs_gfs.h			\
 	nfs/nfs_mount.h			\
@@ -26383,7 +26384,7 @@
 			ac_cv_nfs_prot_headers=sunos3 ;;
 	sunos4* | solaris1* )
 			ac_cv_nfs_prot_headers=sunos4 ;;
-	sunos5.[0-3] | solaris2.[0-3] )
+ 	sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* )
 			ac_cv_nfs_prot_headers=sunos5_3 ;;
 	sunos5.4* | solaris2.4* )
 			ac_cv_nfs_prot_headers=sunos5_4 ;;
Index: hlfsd/stubs.c
--- hlfsd/stubs.c.orig	2005-09-30 04:48:42 +0200
+++ hlfsd/stubs.c	2005-10-11 08:34:46 +0200
@@ -142,7 +142,7 @@
     res.ns_u.ns_attr_u = rootfattr;
   } else if (eq_fh(argp, &slink)) {
 
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__))
     /*
      * This code is needed to defeat Solaris 2.4's (and newer) symlink
      * values cache.  It forces the last-modified time of the symlink to be
@@ -249,7 +249,7 @@
     }
 
     if (STREQ(argp->da_name, slinkname)) {
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__))
       /*
        * This code is needed to defeat Solaris 2.4's (and newer) symlink
        * values cache.  It forces the last-modified time of the symlink to be
Index: fsinfo/fsi_lex.l
--- fsinfo/fsi_lex.l.orig	2006-01-02 19:40:31 +0100
+++ fsinfo/fsi_lex.l	2007-12-22 16:30:14 +0100
@@ -163,9 +163,6 @@
 /* no need to use yyunput() */
 %option nounput
 
-/* allocate more output slots so lex scanners don't run out of mem */
-%o 1024
-
 %start F Q
 
 %%
Index: amd/amfs_toplvl.c
--- amd/amfs_toplvl.c.orig	2006-03-28 18:16:43 +0200
+++ amd/amfs_toplvl.c	2009-04-18 12:41:10 +0200
@@ -227,6 +227,10 @@
       xstrlcat(opts, toplvl_opts, sizeof(opts));
     }
 
+#ifdef MNTTAB_OPT_NOLOCK
+    xstrlcat(opts, ",", sizeof(opts));
+    xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts));
+#endif /* MNTTAB_OPT_NOLOCK */
 #ifdef MNTTAB_OPT_NOAC
     if (gopt.auto_attrcache == 0) {
       xstrlcat(opts, ",", sizeof(opts));
Index: configure
--- configure
+++ configure
@@ -20960,7 +20960,14 @@
 {
 
 if (argc > 1)
+#ifdef UTS_RELEASE
   printf("%s", UTS_RELEASE);
+#else
+# define AMU_MA(a) ((a) >> 16)
+# define AMU_MI(a) (((a) & 0xffff) >> 8)
+# define AMU_PL(a) ((a) & 0xff)
+ printf("%d.%d.%d", AMU_MA(LINUX_VERSION_CODE), AMU_MI(LINUX_VERSION_CODE), AMU_PL(LINUX_VERSION_CODE));
+#endif
 
 exit(0);
 }
Index: conf/mount/mount_linux.c
--- conf/mount/mount_linux.c
+++ conf/mount/mount_linux.c
@@ -277,7 +277,11 @@
   int errorcode;
 
   /* Fake some values for linux */
+#if NFS_MOUNT_VERSION > 4
+  mnt_data->version = 4;
+#else
   mnt_data->version = NFS_MOUNT_VERSION;
+#endif /* NFS_MOUNT_VERSION > 4 */
   if (!mnt_data->timeo) {
 #ifdef MNT2_NFS_OPT_TCP
     if (mnt_data->flags & MNT2_NFS_OPT_TCP)