diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index f2e0f51..d418d63 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-03 Hasso Tepper <hasso at quagga.net>
+
+	* isis_lsp.c: Yet another regression introduced by stream cleanup.
+	  Similar fix to the one commited to lsp_build_nonpseudo() some days
+	  ago.
+
 2005-09-01 Hasso Tepper <hasso at quagga.net>
 
 	* isis_lsp.c: Less TLV leaking.
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index a425b34..cb7b93b 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1911,6 +1911,10 @@
 	}
     }
 
+  /* Reset endp of stream to overwrite only TLV part of it. */
+  lsp->pdu->endp = 0;
+  stream_forward_endp (lsp->pdu, ISIS_FIXED_HDR_LEN + ISIS_LSP_HDR_LEN);
+
   /*
    * Add the authentication info if it's present
    */