diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 453036e..e3a2dfe 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-27 Paul Jakma <paul@dishone.st>
+
+	* ospf_opaque.c: (ospf_opaque_lsa_flush_schedule) do not NULL out
+	  the LSA as then free_opaque_info_per_id() can never unlock (and
+	  free) the LSA. Reported by Gunnar Stigen.
+	  
 2004-07-23 Paul Jakma <paul@dishone.st>
 
 	* ospf_network.c: Replace PKTINFO/RECVIF with call to
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 636839c..73e9639 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -2090,7 +2090,6 @@
     oipt->id_list->head = oipt->id_list->tail = NULL;
 
   /* Disassociate internal control information with the given lsa. */
-  oipi->lsa = NULL;
   free_opaque_info_per_id ((void *) oipi);
 
   /* Force given lsa's age to MaxAge. */