In this paper we shortly describe the present version of PEMAP, a GIS database containing a wide range of information required for evaluating the mainland Portuguese wave power potential, guiding the selection of appropriate areas for deployment of wave farms thus allowing the evaluation of its potential. The first version described in Pontes et al. (2005) included sea bed morphology, slope, coverage and tectonics of the mainland continental shelf, in addition to the electrical grid and administrative division. The present version incorporates also the harbours and shipyards, submarine cables, navigation and defence areas, and other relevant information. The mapping of the theoretical, technical and feasible resources follows enabling the identification of the best areas for wave energy exploitation.