For DC, the land should be returned to the state(s) that ceded it to the federal gummint... not made into a separate state
http://www.virginiaplaces.org/boundaries/retrocession.html
For Puerto Rico (or Guam or Samoa or any other place) Congress has the power to admit a territory into the union as a state... just as they did with every state since the signing of the Constitution.