diff --git a/facter b/facter
index a9cbf3006a2..7a60021a69d 100755
--- a/facter
+++ b/facter
@@ -22,4 +22,6 @@
 #    facter
 #    ruby-json
 
+echo '{ "ansible_facts":'
 /usr/bin/facter --json
+echo '}'
diff --git a/ohai b/ohai
index 3b6f3ae144c..68c0b8acfee 100755
--- a/ohai
+++ b/ohai
@@ -18,4 +18,6 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+echo '{ "ansible_facts":'
 /usr/bin/ohai
+echo '}'
\ No newline at end of file
diff --git a/setup b/setup
index 134cd232e7f..20f3d33902d 100755
--- a/setup
+++ b/setup
@@ -362,9 +362,11 @@ md5sum2 = os.popen("md5sum %s" % ansible_file).read().split()[0]
 if md5sum != md5sum2:
    changed = True
 
-setup_options['written'] = ansible_file
-setup_options['changed'] = changed
-setup_options['md5sum']  = md5sum2 
+setup_result = {}
+setup_result['written'] = ansible_file
+setup_result['changed'] = changed
+setup_result['md5sum']  = md5sum2 
+setup_result['ansible_facts'] = setup_options
 
-print json.dumps(setup_options)
+print json.dumps(setup_result)