diff --git a/ping b/ping
index e52da3c9e94..4bb99de0454 100644
--- a/ping
+++ b/ping
@@ -36,10 +36,15 @@ author: Michael DeHaan
 
 def main():
     module = AnsibleModule(
-        argument_spec = dict(),
+        argument_spec = dict(
+            data=dict(required=False, default=None),
+        ),
         supports_check_mode = True
     )
-    module.exit_json(ping='pong')
+    result = dict(ping='pong')
+    if module.params['data']:
+        result['ping'] = module.params['data']
+    module.exit_json(**result)
 
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>