diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index c0ad500d9d7..8884f986c0a 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -124,6 +124,7 @@ def main(args):
         )
         
         if options.listhosts:
+            print 'playbook: %s' % playbook
             playnum = 0
             for play in pb.playbook:
                 playnum += 1
@@ -131,11 +132,11 @@ def main(args):
                     label = 'unnamed'
                     if 'name' in play:
                         label = play['name']
-                    print 'hosts in play %s: %s' % (playnum, label)
-                    for host in pb.inventory.list_hosts(play['hosts']):
-                        print '  %s' % host
-                    print '\n'
-            return 0
+                    hosts = pb.inventory.list_hosts(play['hosts'])
+                    print '  hosts in play %s (%s): #%d' % (playnum, label, len(hosts))
+                    for host in hosts:
+                        print '    %s' % host
+            continue
 
         if options.syntax:
             # if we've not exited by now then we are fine.