AWS CloudFormation now allows importing existing resources into stacks with the 'ImportExistingResources' parameter.
Read full post