The French parliament has given its final backing to a tough new anti-terrorism bill inspired by the UK's response to the London bombings.
French police will be given more time to question suspects
The new law will allow increased video surveillance in public areas including airports and places of worship.
Police will also be given more time to question terrorist suspects and to check internet and telephone records.
Interior Minister Nicolas Sarkozy has led efforts to strengthen anti-terror laws after the 7 July London attacks.
Concerns about the new law have been raised by civil rights groups and left-wing opposition parties.
They fear it gives authorities too much power to invade people's privacy and encourages confusion between immigration and terrorism.
MPs backed the law on Thursday by 202 votes to 122.
Mr Sarkozy had defended the bill as providing France with "a more efficient arsenal" and giving "greater powers to law enforcement to avoid a catastrophe".
Correspondents say the French authorities were impressed with the use of video footage in identifying the London bombers.
The provisions will oblige internet providers and internet cafes to store and make available to police their customers' connection records.
The new law should also enable the French police to monitor those who travel to countries known to harbour terrorist training camps.