Index: drbd_receiver.c
===================================================================
--- drbd_receiver.c	(.../trunk/drbd/drbd_receiver.c)	(revision 4094)
+++ drbd_receiver.c	(.../branches/drbd-panic/drbd/drbd_receiver.c)	(revision 4094)
@@ -2166,6 +2170,10 @@
 			drbd_send_uuids(mdev);
 			drbd_send_state(mdev);
 		}
+		else if (nconn == Connected && peer_state.disk == Negotiating) {
+			// peer is waiting for us to respond...
+			drbd_send_state(mdev);
+		}
 	}
 
 	spin_lock_irq(&mdev->req_lock);
@@ -2176,6 +2184,7 @@
 	ns.pdsk = peer_state.disk;
 	ns.peer_isp = ( peer_state.aftr_isp | peer_state.user_isp );
 	if(nconn == Connected && ns.disk == Negotiating ) ns.disk = UpToDate;
+	if(nconn == Connected && ns.pdsk == Negotiating ) ns.pdsk = UpToDate;
 	rv = _drbd_set_state(mdev,ns,ChgStateVerbose | ChgStateHard);
 	spin_unlock_irq(&mdev->req_lock);
 	if (rv==SS_Success) {