diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 2906abe..92651f2 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_packet.c: (ospf_db_desc_proc) Fix spelling of packet in warning
+	  message and in comment.
+	  (ospf_db_desc) Warning message that a packet is being discarded
+	  should give the router id of the packet source.  Fix spelling
+	  of packet in two warning messages.
+	  (ospf_ls_req) Warning message that a link state request is being
+	  discarded should give the router id of the neighbor that sent it.
+
 2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* ospf_main.c: Remove #include "debug.h" (was not being used, and
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 729c8f7..57eb2f0 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -978,7 +978,7 @@
       /* Unknown LS type. */
       if (lsah->type < OSPF_MIN_LSA || lsah->type >= OSPF_MAX_LSA)
 	{
-	  zlog_warn ("Pakcet [DD:RECV]: Unknown LS type %d.", lsah->type);
+	  zlog_warn ("Packet [DD:RECV]: Unknown LS type %d.", lsah->type);
 	  OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_SeqNumberMismatch);
 	  return;
 	}
@@ -1059,7 +1059,7 @@
 	  OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_ExchangeDone);
 	}
 
-      /* Send DD pakcet in reply. */
+      /* Send DD packet in reply. */
       ospf_db_desc_send (nbr);
     }
 
@@ -1160,7 +1160,8 @@
     case NSM_Down:
     case NSM_Attempt:
     case NSM_TwoWay:
-      zlog_warn ("Packet[DD]: Neighbor state is %s, packet discarded.",
+      zlog_warn ("Packet[DD]: Neighbor %s state is %s, packet discarded.",
+		 inet_ntoa (ospfh->router_id),
 		 LOOKUP (ospf_nsm_state_msg, nbr->state));
       break;
     case NSM_Init:
@@ -1281,7 +1282,7 @@
 	  (!IS_SET_DD_MS (nbr->dd_flags) &&
 	   ntohl (dd->dd_seqnum) != nbr->dd_seqnum + 1))
 	{
-	  zlog_warn ("Pakcet[DD]: sequence number mismatch.");
+	  zlog_warn ("Packet[DD]: sequence number mismatch.");
 	  OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_SeqNumberMismatch);
 	  break;
 	}
@@ -1296,7 +1297,7 @@
 	  if (IS_SET_DD_MS (nbr->dd_flags))
 	    {
 	      /* Master should discard duplicate DD packet. */
-	      zlog_warn ("Pakcet[DD]: duplicated, packet discarded.");
+	      zlog_warn ("Packet[DD]: duplicated, packet discarded.");
 	      break;
 	    }
 	  else
@@ -1360,7 +1361,9 @@
       nbr->state != NSM_Loading &&
       nbr->state != NSM_Full)
     {
-      zlog_warn ("Link State Request: Neighbor state is %s, packet discarded.",
+      zlog_warn ("Link State Request received from %s: "
+      		 "Neighbor state is %s, packet discarded.",
+		 inet_ntoa (ospfh->router_id),
 		 LOOKUP (ospf_nsm_state_msg, nbr->state));
       return;
     }