diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index c5255ab5ba43..890e4b2a6efc 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	amd
 MAN8=	amd.0
-OS=	netbsd
 SRCS=	afs_ops.c am_ops.c clock.c util.c xutil.c \
 	efs_ops.c mapc.c info_file.c info_hes.c \
 	info_ndbm.c info_passwd.c info_nis.c \
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 4ab1774ba4e7..587b101d7c34 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -5,8 +5,8 @@ SRCS = amq.c amq_clnt.c misc_rpc.c
 CFLAGS+=-I${.CURDIR}/../config
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-DARCH_REP=\"${MACHINE}\"
-CFLAGS+=-DOS_REP=\"netbsd\"
-CFLAGS+=-DOS_HDR=\"os-netbsd.h\"
+CFLAGS+=-DOS_REP=\"${OS}\"
+CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
 DPADD+=	${LIBRPCSVC}
 LDADD+=	-lrpcsvc
 .PATH: ${.CURDIR}/../amd
diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h
index 5a60e7b61c85..c0fd0817db2c 100644
--- a/usr.sbin/amd/config/os-bsd44.h
+++ b/usr.sbin/amd/config/os-bsd44.h
@@ -37,7 +37,7 @@
  *
  *	%W% (Berkeley) %G%
  *
- * $Id: os-bsd44.h,v 1.1 1993/11/27 21:18:58 mycroft Exp $
+ * $Id: os-bsd44.h,v 1.2 1993/11/27 21:38:37 mycroft Exp $
  *
  * 4.4 BSD definitions for Amd (automounter)
  */
@@ -102,12 +102,20 @@
  * How to copy an address into an NFS filehandle
  */
 #undef NFS_SA_DREF
+#ifndef __NetBSD__
 #define	NFS_SA_DREF(dst, src) { \
 		(dst).addr = (struct sockaddr *) (src); \
 		(dst).addrlen = sizeof(*src); \
 		(dst).sotype = SOCK_DGRAM; \
 		(dst).proto = 0; \
 	}
+#else /* __NetBSD__ */
+#define	NFS_SA_DREF(dst, src) { \
+		(dst).addr = (struct sockaddr *) (src); \
+		(dst).sotype = SOCK_DGRAM; \
+		(dst).proto = 0; \
+	}
+#endif /* __NetBSD__ */
 
 /*
  * Byte ordering
@@ -149,7 +157,9 @@ XXX - Probably no hope of running Amd on this machine!
 #define	MNTOPT_SOFT	"soft"		/* soft mount */
 #define	MNTOPT_INTR	"intr"		/* interrupts allowed */
 
+#ifndef __NetBSD__
 #define NFSMNT_HOSTNAME	0		/* hostname on 4.4 is not optional */
+#endif
 
 struct mntent {
 	char	*mnt_fsname;	/* name of mounted file system */