diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index d294a22..bc17a60 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08 Mattias Amnefelt <mattiasa@kth.se?
+
+	* ospf_packet.c: (ospf_recv_packet) OpenBSD now leaves iph.ip_len 
+	  network byte order.
+
 2003-12-05  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
 	* ospfd.c (ospf_network_match_iface): Rewrite code for clarity
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index d7337c1..86ed387 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1936,13 +1936,13 @@
       return NULL;
     }
 
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || (defined(__OpenBSD__) && (OpenBSD < 200311))
   ip_len = iph.ip_len;
 #else
   ip_len = ntohs (iph.ip_len);
 #endif
 
-#if !defined(GNU_LINUX)
+#if !defined(GNU_LINUX) && (OpenBSD < 200311)
   /*
    * Kernel network code touches incoming IP header parameters,
    * before protocol specific processing.