diff --git a/library/ec2_facts b/library/ec2_facts
new file mode 100644
index 00000000000..40984f44c7d
--- /dev/null
+++ b/library/ec2_facts
@@ -0,0 +1,125 @@
+#!/usr/bin/python -tt
+# -*- coding: utf-8 -*-
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+
+DOCUMENTATION = '''
+---
+module: ec2_facts
+short_description: Gathers facts about remote hosts within ec2 (aws)
+options: {}
+description: 
+     - This module fetches data from the metadata servers in ec2 (aws).
+       Eucalyptus cloud provides a similar service and this module should
+       work this cloud provider as well. 
+notes: 
+    - Parameters to filter on ec2_facts may be added later.
+examples:
+    - code: ansible all -m ec2_facts --tree /tmp/facts
+      description: Obtain facts from ec2 metatdata servers. You will need to
+      run an instance within ec2.
+
+author: Silviu Dicu: silviudicu@gmail.com
+'''
+
+import urllib2
+import socket
+import re
+
+socket.setdefaulttimeout(5)
+
+class Ec2Metadata(object):
+    
+    ec2_metadata_uri = 'http://169.254.169.254/latest/meta-data/'
+    ec2_sshdata_uri  = 'http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key'
+    ec2_userdata_uri = 'http://169.254.169.254/latest/user-data/'
+
+    def __init__(self, ec2_metadata_uri=None, ec2_sshdata_uri=None, ec2_userdata_uri=None):
+        self.uri_meta = ec2_metadata_uri or self.ec2_metadata_uri
+        self.uri_user = ec2_userdata_uri or self.ec2_userdata_uri
+        self.uri_ssh  =  ec2_sshdata_uri or self.ec2_sshdata_uri
+        self._data     = {} 
+        self._prefix   = 'ansible_ec2_%s' 
+
+    def _fetch(self, url):
+        try:
+            return urllib2.urlopen(url).read()
+        except urllib2.HTTPError:
+            return
+        except urllib2.URLError:
+            return
+
+    def _mangle_fields(self, fields, uri, filter_patterns=['public-keys-0']):
+        new_fields = {}
+        for key, value in fields.iteritems():
+            split_fields = key[len(uri):].split('/')
+            if len(split_fields) > 1 and split_fields[1]:
+                new_key = "-".join(split_fields)
+                new_fields[self._prefix % new_key] = value
+            else:
+                new_key = "".join(split_fields)
+                new_fields[self._prefix % new_key] = value
+        for pattern in filter_patterns:
+            for key in new_fields.keys():
+                match = re.search(pattern, key)
+                if match: new_fields.pop(key)
+        return new_fields
+
+    def fetch(self, uri, recurse=True):
+        raw_subfields = self._fetch(uri)
+        if not raw_subfields:
+            return
+        subfields = raw_subfields.split('\n')
+        for field in subfields:
+            if field.endswith('/') and recurse:
+                self.fetch(uri + field)
+            if uri.endswith('/'):
+                new_uri = uri + field
+            else:
+                new_uri = uri + '/' + field
+            if new_uri not in self._data and not new_uri.endswith('/'):
+                content = self._fetch(new_uri)
+                if field == 'security-groups':
+                    sg_fields = ",".join(content.split('\n'))
+                    self._data['%s' % (new_uri)]  = sg_fields
+                else:
+                    self._data['%s' % (new_uri)] = content
+
+    def run(self):
+        self.fetch(self.uri_meta) # populate _data
+        data =  self._mangle_fields(self._data,
+                                self.uri_meta)
+        data[self._prefix % 'user-data'] = self._fetch(self.uri_user)
+        data[self._prefix % 'public-key'] = self._fetch(self.uri_ssh)
+        return data
+
+
+def main():
+    ec2_facts = Ec2Metadata().run()
+    ec2_facts_result = { 
+                    "changed" : False,
+                    "ansible_facts" : ec2_facts
+                }
+    module = AnsibleModule(
+        argument_spec = dict()
+    )
+    module.exit_json(**ec2_facts_result)
+
+# this is magic, see lib/ansible/module_common.py
+#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+
+main()