Powers over policing should be devolved to Wales, First Minister Carwyn Jones has said.
Mr Jones made the call as he unveiled the Welsh Government's vision for the principality within a devolved United Kingdom.
His administration's submission to the Silk Commission, which is looking at the scope of the Welsh Assembly's remit, says devolution needs to be "enhanced and restructured" through a new Government of Wales Act.
As well as calling for powers over the police force, the Welsh Government admitted for the first time that in the "long term" it would also like to see criminal justice devolved to Wales. But while it wants control over large-scale energy projects, the Welsh Government is not seeking powers in regard to nuclear energy.
Welsh Labour leader Mr Jones said: "Decisions that affect Wales should only be taken in Wales. Policing and criminal justice are the only mainstream public services which are not devolved to Wales. That status quo is becoming increasingly hard to justify. Policing should now be devolved. Policing is the only emergency service that is not devolved."
The scope of devolution in Wales has gradually increased since the Welsh Assembly came into being in 1999. It currently has powers in 20 fields, and, following a referendum in 2011, AMs in the Senedd now have primary law making powers in those 20 areas.
Last year, the independent Silk Commission began its work in looking at the overall picture - and whether more powers should be devolved or whether some should be taken away. In the first stage of its two-part work, it recommended by 2020 the Welsh and UK governments should share responsibility for income tax paid in Wales - and that the Welsh Government should have the power to set the rate of its share. A report on the second stage - which is reviewing the Assembly's powers - is expected before the end of the year.
Ahead of then, the Welsh Government has laid its cards on the table and submitted an evidence paper on what it would like to see happen.
Mr Jones told reporters at a press conference in Cathays Park, Cardiff, he believes none of the Assembly's powers should be removed and that more are needed. The powers his Government are seeking include: policing, community safety and crime prevention; water; road safety - including powers for speed and drink-driving limits; ports; licensing of alcohol and late-night entertainment; and administration of elections.
Former barrister Mr Jones added: "Where we make proposals for enhanced powers for Wales, we do so with a clear purpose - to improve the quality of life for the people in Wales. The key decisions over policing, energy, public transport and community safety should be taken in Wales, for Wales, by those of us directly elected by the people of Wales."