diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index b8f526e..11fb3b6 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-15  Greg Troxel  <gdt@fnord.ir.bbn.com>
+
+	* ospf_packet.c (ospf_recv_packet): Assume CMSG_SPACE is present
+	and works (lib/zebra.h provides if OS doesn't).
+
 2004-11-15 Paul Jakma <paul@dishone.st>
 
 	* ospf_{apiserver,te}.c: ospf_lsa_free's should be ospf_lsa_unlock.
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 5a1c091..c582533 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2007,12 +2007,8 @@
   struct stream *ibuf;
   unsigned int ifindex = 0;
   struct iovec iov;
-#if defined(CMSG_SPACE)
   /* Header and data both require alignment. */
   char buff [CMSG_SPACE(SOPT_SIZE_CMSG_IFINDEX_IPV4())];
-#else
-  char buff [sizeof (struct cmsghdr) + SOPT_SIZE_CMSG_IFINDEX_IPV4()];
-#endif
   struct msghdr msgh;
 
   memset (&msgh, 0, sizeof (struct msghdr));