diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c
index 1e1f4143920..dbdfb895d72 100644
--- a/sys/dev/ath/if_ath_rx.c
+++ b/sys/dev/ath/if_ath_rx.c
@@ -172,9 +172,14 @@ ath_calcrxfilter(struct ath_softc *sc)
 	 *
 	 * Otherwise we only really need to hear beacons from
 	 * our own BSSID.
+	 *
+	 * IBSS? software beacon miss? Just receive all beacons.
+	 * We need to hear beacons/probe requests from everyone so
+	 * we can merge ibss.
 	 */
-	if (ic->ic_opmode == IEEE80211_M_STA ||
-	    ic->ic_opmode == IEEE80211_M_IBSS || sc->sc_swbmiss) {
+	if (ic->ic_opmode == IEEE80211_M_IBSS || sc->sc_swbmiss) {
+		rfilt |= HAL_RX_FILTER_BEACON;
+	} else if (ic->ic_opmode == IEEE80211_M_STA) {
 		if (sc->sc_do_mybeacon && ! sc->sc_scanning) {
 			rfilt |= HAL_RX_FILTER_MYBEACON;
 		} else { /* scanning, non-mybeacon chips */
@@ -431,7 +436,6 @@ ath_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m,
 			sc->sc_syncbeacon = 0;
 		}
 
-
 		/* fall thru... */
 	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
 		if (vap->iv_opmode == IEEE80211_M_IBSS &&