Index: conf/mount/mount_linux.c
--- conf/mount/mount_linux.c.orig	2005-09-12 03:55:40 +0200
+++ conf/mount/mount_linux.c	2005-09-28 16:29:51 +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-09-19 05:05:08 +0200
+++ config.h.in	2005-09-28 16:29:51 +0200
@@ -159,6 +159,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
 
@@ -712,6 +715,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-09-19 05:05:07 +0200
+++ configure	2005-09-28 16:34:17 +0200
@@ -20836,7 +20836,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
@@ -24960,6 +24960,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			\
@@ -26337,7 +26338,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 ;;
@@ -50442,9 +50443,9 @@
 if test -n "ufs"
 then
   ac_fs_name=ufs
-  ac_fs_as_name=" (from: ext2 ffs ufs 42 efs xfs jfs ultrix)"
+  ac_fs_as_name=" (from: ext3 ext2 ffs ufs 42 efs xfs jfs ultrix)"
 else
-  ac_fs_name=ext2 ffs ufs 42 efs xfs jfs ultrix
+  ac_fs_name=ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
   ac_fs_as_name=""
 fi
 # store variable name of filesystem
@@ -50461,7 +50462,7 @@
 
 # assume not found
 eval "ac_cv_fs_$ac_fs_name=no"
-for ac_fs_tmp in ext2 ffs ufs 42 efs xfs jfs ultrix
+for ac_fs_tmp in ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
 do
   ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 
@@ -54306,7 +54307,7 @@
 then
   ac_fs_name=ufs
 else
-  ac_fs_name=4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
+  ac_fs_name=4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
 fi
 # prepare upper-case name of filesystem
 ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -54323,7 +54324,7 @@
 # undefine by default
 eval "ac_cv_mount_type_$ac_fs_name=notfound"
 # and look to see if it was found
-for ac_fs_tmp in 4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
+for ac_fs_tmp in 4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
 do
 
   ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'`
@@ -59804,7 +59805,7 @@
 then
   ac_fs_name=ufs
 else
-  ac_fs_name=ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
+  ac_fs_name=ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
 fi
 # store variable name of fs
 ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -59821,7 +59822,7 @@
 # undefine by default
 eval "ac_cv_mnttab_type_$ac_fs_name=notfound"
 # and look to see if it was found
-for ac_fs_tmp in ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
+for ac_fs_tmp in ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
 do
   if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_fs_nfs3" = "yes" -a "$ac_cv_header_linux_nfs_h" = "yes"
   then
Index: hlfsd/stubs.c
--- hlfsd/stubs.c.orig	2005-08-03 02:35:36 +0200
+++ hlfsd/stubs.c	2005-09-28 16:29:51 +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