diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index fb68010513f3..19e3126be27b 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -40,7 +40,7 @@ mount.h: ${MOUNT_X}
 mount_xdr.c: mount.h ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
-${OBJS}: nfs_prot.h
+${OBJS} beforedepend: nfs_prot.h
 
 nfs_prot.h: ${NFS_PROT_X}
 	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index f0618aef194d..c3f87a38e772 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -3,6 +3,7 @@
 PROG = amq
 MAN8 = amq.8
 SRCS = amq.c amq_clnt.c amq_xdr.c misc_rpc.c
+CFLAGS+=-I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../rpcx
 CFLAGS+=-I${.CURDIR}/../config
@@ -10,6 +11,14 @@ CFLAGS+=-DARCH_REP=\"${MACHINE}\"
 CFLAGS+=-DOS_REP=\"bsd44\"
 CFLAGS+=-DOS_HDR=\"os-bsd44.h\"
 .PATH: ${.CURDIR}/../rpcx ${.CURDIR}/../amd
+CLEANFILES+=nfs_prot.h
+RPCCOM = rpcgen
+NFS_PROT_X= /usr/include/rpcsvc/nfs_prot.x
+
+nfs_prot.h: ${NFS_PROT_X}
+	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
+
+${OBJS} beforedepend: nfs_prot.h
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 52c2a4941837..c1cc6b14a08e 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -1,11 +1,20 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/28/93
 
 PROG=	mk-amd-map
+CFLAGS+=-I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../rpcx
 CFLAGS+=-I${.CURDIR}/../config
 CFLAGS+=-DOS_HDR=\"os-bsd44.h\"
 MAN8=	mk-amd-map.8
+CLEANFILES+=nfs_prot.h
+RPCCOM = rpcgen
+NFS_PROT_X= /usr/include/rpcsvc/nfs_prot.x
+
+nfs_prot.h: ${NFS_PROT_X}
+	${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET}
+
+${OBJS} beforedepend: nfs_prot.h
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>