Distributed publish/subscribe systems are usually deployed on top of an overlay network that enables complex routing strategies implemented in the application layer. Up to now, only little effort has been spent on the design of the broker overlay network assuming that it is either static or manually administered. As publish/subscribe systems are increasingly targeted at dynamic environments where client behavior and network characteristics vary over time, static overlay networks lead to suboptimal performance. In this paper, we present a self-organizing broker overlay infrastructure that adapts dynamically to achieve a better efficiency on both, the application and the network layer. This is obtained by taking network metrics as well as notification traffic into account.