diff --git a/p2v/conversion.c b/p2v/conversion.c
index 3c379cb6f..b8bab34d2 100644
--- a/p2v/conversion.c
+++ b/p2v/conversion.c
@@ -1060,6 +1060,11 @@ generate_wrapper_script (struct config *config, const char *remote_dir,
   fprintf (fp, "rm -f $log\n");
   fprintf (fp, "\n");
 
+  fprintf (fp,
+           "# Log the environment where virt-v2v will run.\n");
+  fprintf (fp, "printenv > environment\n");
+  fprintf (fp, "\n");
+
   fprintf (fp,
            "# Run virt-v2v.  Send stdout back to virt-p2v.  Send stdout\n"
            "# and stderr (debugging info) to the log file.\n");
diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod
index 075256e03..ec8eff244 100644
--- a/p2v/virt-p2v.pod
+++ b/p2v/virt-p2v.pod
@@ -662,6 +662,12 @@ The dmesg output from the physical machine.  Useful for detecting
 problems such as missing device drivers or firmware on the virt-p2v
 ISO.
 
+=item F<environment>
+
+I<(before conversion)>
+
+The content of the environment where L<virt-v2v(1)> will run.
+
 =item F<lscpu>
 
 =item F<lspci>