Mobile ad-hoc network are an emerging research field due to the potential range of applications that they support and for the problems they present due to their dynamic nature. Peer-to-peer is an example of a class of applications that have recently been deployed on top of ad-hoc networks. In this paper we propose an approach based on context-awareness to allow peer-to-peer applications to exploit information on the underlying network context to achieve better performance and better group organization. Information such as availability of resources, battery power, services in reach and relative distances can be used to improve the routing structures of the peer-to-peer network, thus reducing the routing overhead.