--- nfs/syscalls.c.orig	Tue Jun 30 12:24:56 1998
+++ nfs/syscalls.c	Tue Nov 18 16:52:35 2003
@@ -12,8 +12,10 @@
 #define NFSCLIENT
 #include "syshdr.h"
 #include <rpc/rpc.h>
-#if !(defined HP || defined IRIX)
+#if !(defined HP || defined IRIX || __FreeBSD_version >= 501113) 
 #include "nfs_prot.h"
+#else
+#include <nfs/nfsproto.h>
 #endif
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -56,7 +58,16 @@
 #define NFSX_V2FH 32
 #ifdef BSD4_4_LITE2
 #	include <nfs/rpcv2.h>
-#	include <nfs/nfs.h>
+#	if (__FreeBSD_version >= 500024)
+#
+#		/* XXX __FreeBSD_version 500024 is the closest we have to the
+#		   NFS reorganization that took place 2001-09-18. This leaves
+#		   a 2 week window. */
+#
+#		include <nfsclient/nfs.h>
+#	else
+#		include <nfs/nfs.h>
+#	endif
 #endif
 int	syscall_mount(char *dir, void *root_fh, int sock_fd,
 									struct sockaddr_in *socket, char *mntfrom)
