diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d
index 01b9cf61c5e9..be342286f1b5 100644
--- a/cddl/lib/libdtrace/nfs.d
+++ b/cddl/lib/libdtrace/nfs.d
@@ -28,8 +28,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
 #pragma	D depends_on module nfs
@@ -47,32 +45,62 @@ typedef struct nfsv4cbinfo {
 #pragma D binding "1.5" translator
 translator conninfo_t < struct svc_req *P > {
 	ci_protocol = P->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+	    P->rq_xprt->xp_master->xp_netid == "udp" ? "ipv4" :
 	    P->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+	    P->rq_xprt->xp_master->xp_netid == "udp6" ? "ipv6" :
 	    "<unknown>";
 
-	ci_local = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+	ci_local = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp") ?
+	    inet_ntoa(&((struct sockaddr_in *)
+	    P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin_addr.S_un.S_addr) :
+	    (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp6") ?
+	    inet_ntoa6(&((struct sockaddr_in6 *)
+	    P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin6_addr) :
+	    "unknown";
 
-	ci_remote = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+	ci_remote = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp") ?
+	    inet_ntoa(&((struct sockaddr_in *)
+	    P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin_addr.S_un.S_addr) :
+	    (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp6") ?
+	    inet_ntoa6(&((struct sockaddr_in6 *)
+	    P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin6_addr) :
+	    "unknown";
 };
 
 #pragma D binding "1.5" translator
-translator conninfo_t < struct compound_state *P > {
-	ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
-	    P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
-	    "<unknown>";
+translator conninfo_t < rfs4_client_t *P > {
+	ci_protocol = (P->rc_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
 
-	ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+	ci_local = "<unknown>";
 
-	ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+	ci_remote = (P->rc_addr.ss_family == AF_INET) ?
+	    inet_ntoa((ipaddr_t *)
+	    &((struct sockaddr_in *)&P->rc_addr)->sin_addr) :
+	    inet_ntoa6(&((struct sockaddr_in6 *)&P->rc_addr)->sin6_addr);
 };
 
 #pragma D binding "1.5" translator
-translator nfsv4opinfo_t < struct compound_state *P > {
-	noi_xid = P->req->rq_xprt->xp_xid;
-	noi_cred = P->basecr;
-	noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
+translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
+	nci_curpath = (P->rds_finfo->rf_vp == NULL) ? "<unknown>" :
+	    P->rds_finfo->rf_vp->v_path;
+};
+
+typedef struct nfsv3opinfo {
+	uint64_t noi_xid;	/* unique transation ID */
+	cred_t *noi_cred;	/* credentials for operation */
+	string noi_curpath;	/* current file handle path (if any) */
+} nfsv3opinfo_t;
+
+typedef struct nfsv3oparg nfsv3oparg_t;
+
+#pragma D binding "1.5" translator
+translator nfsv3opinfo_t < nfsv3oparg_t *P > {
+	noi_xid = ((struct svc_req *)arg0)->rq_xprt->xp_xid;
+	noi_cred = (cred_t *)arg1;
+	noi_curpath = (arg2 == 0 || ((vnode_t *)arg2)->v_path == NULL) ?
+	    "<unknown>" : ((vnode_t *)arg2)->v_path;
 };
diff --git a/cddl/lib/libdtrace/nfssrv.d b/cddl/lib/libdtrace/nfssrv.d
index f4d969d17788..68ac08b58cde 100644
--- a/cddl/lib/libdtrace/nfssrv.d
+++ b/cddl/lib/libdtrace/nfssrv.d
@@ -24,31 +24,31 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
 #pragma	D depends_on module nfs.d
 #pragma D depends_on module nfssrv
 
 #pragma D binding "1.5" translator
-translator conninfo_t < rfs4_client_t *P > {
-	ci_protocol = (P->cl_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
+translator conninfo_t < struct compound_state *P > {
+	ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+	    P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+	    "<unknown>";
 
-	ci_local = "<unknown>";
+	ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
 
-	ci_remote = (P->cl_addr.ss_family == AF_INET) ?
-	    inet_ntoa((ipaddr_t *)
-	    &((struct sockaddr_in *)&P->cl_addr)->sin_addr) :
-	    inet_ntoa6(&((struct sockaddr_in6 *)&P->cl_addr)->sin6_addr);
+	ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
 };
 
 #pragma D binding "1.5" translator
-translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
-	nci_curpath = (P->finfo->vp == NULL) ? "<unknown>" :
-	    P->finfo->vp->v_path;
+translator nfsv4opinfo_t < struct compound_state *P > {
+	noi_xid = P->req->rq_xprt->xp_xid;
+	noi_cred = P->basecr;
+	noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
 };