Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 5830)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 5831)
@@ -124,4 +124,9 @@
     
     /**
+     * Command-line arguments used to run the application.
+     */
+    public static String[] commandLineArgs;
+    
+    /**
      * The worker thread slave. This is for executing all long and intensive
      * calculations. The executed runnables are guaranteed to be executed separately
@@ -165,4 +170,7 @@
     public UndoRedoHandler undoRedo = new UndoRedoHandler();
 
+    /**
+     * The progress monitor being currently displayed.
+     */
     public static PleaseWaitProgressMonitor currentProgressMonitor;
 
@@ -282,4 +290,5 @@
      * Remove the specified layer from the map. If it is the last layer,
      * remove the map as well.
+     * @param layer The layer to remove
      */
     public final void removeLayer(final Layer layer) {
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 5830)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 5831)
@@ -8,5 +8,8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.lang.management.ManagementFactory;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -66,4 +69,17 @@
         text.append("Operating system: "+ System.getProperty("os.name"));
         text.append("\n");
+        try {
+            List<String> vmArguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
+            if (!vmArguments.isEmpty()) {
+                text.append("VM arguments: "+ vmArguments);
+                text.append("\n");
+            }
+        } catch (SecurityException e) {
+            // Ignore exception
+        }
+        if (Main.commandLineArgs.length > 0) {
+            text.append("Program arguments: "+ Arrays.toString(Main.commandLineArgs));
+            text.append("\n");
+        }
         DataSet dataset = Main.main.getCurrentDataSet();
         if (dataset != null) {
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 5830)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 5831)
@@ -264,4 +264,6 @@
             System.exit(1);
         }
+        
+        Main.commandLineArgs = argArray;
 
         if (args.containsKey(Option.VERSION)) {