Managing target fishery resources together with the associated and dependent species and their critical habitats has progressed over 5 decades from a concern, to a mandate, and a growing legal obligation for fisheries management, from the global UN and FAO level to the local and fishery level. Implemented initially on a stock-by-stock basis, the management scope has broadened since UNCED, the creation of the CBD and the adoption of the Ecosystem Approach. The UN, CBD, IUCN, FAO, environmental and sectoral NGOs and States have been working, each within their mandates, towards mainstreaming biodiversity concerns in fisheries policies, strategies, management plans, and measures. CBD concerns regarding mainstreaming of biodiversity concerns in fisheries are encapsulated in The Aichi Target 6. FAO efforts towards Target 6 are materialized in the Code of Conduct for Responsible Fisheries and its implementation using the Ecosystem Approach to Fisheries. Mainstreaming requires profound mutations of governance system, legal frames, approaches, measures, incentives, fishing technology and practices, communication, markets and customer preferences. Progress since UNCED will be presented and discussed, as well as deficiencies and gaps, and the need for coherence of policies and practices in conservation and fisheries governance streams. Suggestions will be made to further mainstreaming in the future.