diff --git a/docsite/rst/playbooks_lookups.rst b/docsite/rst/playbooks_lookups.rst
index 9cfac497b9a..725a26eafb0 100644
--- a/docsite/rst/playbooks_lookups.rst
+++ b/docsite/rst/playbooks_lookups.rst
@@ -2,14 +2,16 @@ Using Lookups
 =============
 
 Lookup plugins allow access of data in Ansible from outside sources.  These plugins are evaluated on the Ansible control
-machine, and can include reading the filesystem but also contacting external datastores and services.  
+machine, and can include reading the filesystem but also contacting external datastores and services.
 These values are then made available using the standard templating system
 in Ansible, and are typically used to load variables or templates with information from those systems.
 
-.. note:: This is considered an advanced feature, and many users will probably not rely on these features.  
+.. note:: This is considered an advanced feature, and many users will probably not rely on these features.
 
 .. note:: Lookups occur on the local computer, not on the remote computer.
 
+.. note:: Since 1.9 you can pass wantlist=True to lookups to use in jinja2 template "for" loops.
+
 .. contents:: Topics
 
 .. _getting_file_contents:
diff --git a/lib/ansible/utils/template.py b/lib/ansible/utils/template.py
index 9556b8fcea8..722e33e4c8f 100644
--- a/lib/ansible/utils/template.py
+++ b/lib/ansible/utils/template.py
@@ -89,6 +89,8 @@ def lookup(name, *args, **kwargs):
     instance = utils.plugins.lookup_loader.get(name.lower(), basedir=kwargs.get('basedir',None))
     tvars = kwargs.get('vars', None)
 
+    wantlist = kwargs.pop('wantlist', False)
+
     if instance is not None:
         try:
             ran = instance.run(*args, inject=tvars, **kwargs)
@@ -98,7 +100,7 @@ def lookup(name, *args, **kwargs):
             raise errors.AnsibleUndefinedVariable("One or more undefined variables: %s" % str(e))
         except Exception, e:
             raise errors.AnsibleError('Unexpected error in during lookup: %s' % e)
-        if ran:
+        if ran and not wantlist:
             ran = ",".join(ran)
         return ran
     else: