diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 41f623f..84fddeb 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -678,8 +678,7 @@
 	zlog_debug ("%s passive open", peer->host);
     }
 
-  if (! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
-    bgp_open_send (peer);
+  bgp_open_send (peer);
 
   return 0;
 }
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index c7d3389..885082f 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -251,6 +251,8 @@
     peer->local_id = peer1->local_id;
     peer->v_holdtime = peer1->v_holdtime;
     peer->v_keepalive = peer1->v_keepalive;
+    peer->local_as = peer1->local_as;
+    peer->change_local_as = peer1->change_local_as;
 
     /* Make peer's address string. */
     sockunion2str (&su, buf, SU_ADDRSTRLEN);
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 51b006a..d3acbd2 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1423,6 +1423,9 @@
  	   *   Connect                       Connect
  	   *
            *
+           * Note that Active->OpenSent historically in Quagga did not send
+           * OPEN on the accept-peer connection.
+           *
  	   * If both sides are Quagga, they're almost certain to wait for
  	   * the same amount of time of course (which doesn't preclude other
  	   * implementations also waiting for same time). The race is
@@ -1466,6 +1469,11 @@
       realpeer->ibuf = peer->ibuf;
       realpeer->packet_size = peer->packet_size;
       peer->ibuf = NULL;
+    
+      /* Transfer output buffer, there may be an OPEN queued to send */
+      stream_fifo_free (realpeer->obuf);
+      realpeer->obuf = peer->obuf;
+      peer->obuf = NULL;
 
       /* Transfer status. */
       realpeer->status = peer->status;
@@ -1473,7 +1481,6 @@
       
       /* peer pointer change. Open packet send to neighbor. */
       peer = realpeer;
-      bgp_open_send (peer);
       if (peer->fd < 0)
 	{
 	  zlog_err ("bgp_open_receive peer's fd is negative value %d",
@@ -1481,6 +1488,8 @@
 	  return -1;
 	}
       BGP_READ_ON (peer->t_read, bgp_read, peer->fd);
+      if (stream_fifo_head (peer->obuf))
+        BGP_WRITE_ON (peer->t_write, bgp_write, peer->fd);
     }
 
   /* remote router-id check. */