--- nfs/syscalls.c.orig	Thu Oct 11 14:20:28 2001
+++ nfs/syscalls.c	Thu Oct 11 14:20:33 2001
@@ -56,7 +56,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)
