diff --git a/files/replace.py b/files/replace.py
index 79cfa181d74..fa7058d70f9 100644
--- a/files/replace.py
+++ b/files/replace.py
@@ -142,15 +142,25 @@ def main():
         contents = f.read()
         f.close()
 
+    if module._diff:
+        diff = {
+            'before_header': dest,
+            'before': contents,
+        }
+
     mre = re.compile(params['regexp'], re.MULTILINE)
     result = re.subn(mre, params['replace'], contents, 0)
 
     if result[1] > 0 and contents != result[0]:
         msg = '%s replacements made' % result[1]
         changed = True
+        if module._diff:
+            diff['after_header'] = dest
+            diff['after'] = result[0]
     else:
         msg = ''
         changed = False
+        diff = dict()
 
     if changed and not module.check_mode:
         if params['backup'] and os.path.exists(dest):
@@ -160,7 +170,7 @@ def main():
         write_changes(module, result[0], dest)
 
     msg, changed = check_file_attrs(module, changed, msg)
-    module.exit_json(changed=changed, msg=msg)
+    module.exit_json(changed=changed, msg=msg, diff=diff)
 
 # this is magic, see lib/ansible/module_common.py
 from ansible.module_utils.basic import *