diff --git a/ChangeLog b/ChangeLog
index ad39fc63d..7f083a359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020407
  - (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now.
    Future: we may want to test if fd passing works correctly.
+ - (stevesk) [monitor_fdpass.c] fatal() for UsePrivilegeSeparation=yes
+   and no fd passing support.
 
 20020406
  - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann 
@@ -8191,4 +8193,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2034 2002/04/07 16:18:03 stevesk Exp $
+$Id: ChangeLog,v 1.2035 2002/04/07 16:39:12 stevesk Exp $
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index eed1dc162..0045977e4 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -34,6 +34,7 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $");
 void
 mm_send_fd(int socket, int fd)
 {
+#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
 	struct msghdr msg;
 	struct iovec vec;
 	char ch = '\0';
@@ -68,11 +69,16 @@ mm_send_fd(int socket, int fd)
 	if (n != 1)
 		fatal("%s: sendmsg: expected sent 1 got %d",
 		    __FUNCTION__, n);
+#else
+	fatal("%s: UsePrivilegeSeparation=yes not supported",
+	    __FUNCTION__);
+#endif
 }
 
 int
 mm_receive_fd(int socket)
 {
+#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
 	struct msghdr msg;
 	struct iovec vec;
 	char ch;
@@ -112,4 +118,8 @@ mm_receive_fd(int socket)
 	fd = (*(int *)CMSG_DATA(cmsg));
 #endif
 	return fd;
+#else
+	fatal("%s: UsePrivilegeSeparation=yes not supported",
+	    __FUNCTION__);
+#endif
 }