The White House has restored the press credentials of CNN reporter Jim Acosta, less than two weeks after withdrawing them over an argument with President Trump during a news conference.
The reversal came days after a judge ordered the administration to reinstate the journalist's press pass.
Announcing its decision on Monday, the White House also issued "rules governing future press conferences".
These include allowing only a single question from each journalist.
Follow-up questions, the White House adds in a letter to Mr Acosta, will only be allowed "at the discretion of the president or other White House officials".
The letter warned that further action against Acosta will be taken unless he follows the new rules.
Mr Trump has threatened to walk out of future press briefings if reporters do not act with "decorum".
Reacting to Monday's decision restoring his pass, Acosta said he was looking forward to returning to the White House.
How did the row begin?
During the 8 November news conference, a White House intern tried to take the microphone from Mr Acosta as he attempted to ask the president a follow-up question.
Mr Trump called Acosta "a rude, terrible person" and the reporter was barred from entering the White House a day later.
CNN filed a lawsuit to have Acosta's pass restored, and was joined by other media organisations in their efforts including conservative-leaning Fox News.
In a preliminary ruling on Friday, a Washington DC judge said the administration had not provided sufficient justification for the revocation, and Acosta's constitutional rights outweighed the White House's right to have an orderly news conference.