diff --git a/tools/winemaker b/tools/winemaker
index aaf0d9c70e6..b6e5e7c9e4b 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -318,7 +318,7 @@ sub target_init($)
 
 ##
 # This is the path in which this project is located. In other
-# words, this is the path to  the Makefile.
+# words, this is the path to the Makefile.
 my $P_PATH=0;
 
 ##
@@ -2376,7 +2376,13 @@ sub generate_project_files($)
   }
 
   print FILEO "### Generated by Winemaker $version\n";
-  print FILEO "\n\n";
+  print FILEO "###\n";
+  print FILEO "### Invocation command line was\n";
+  print FILEO "### $0";
+  foreach(@ARGV) {
+    print FILEO " $_";
+  }
+  print FILEO "\n\n\n";
 
   generate_list("SRCDIR",1,[ "." ]);
   if (@$project[$P_PATH] eq "") {
@@ -2653,8 +2659,8 @@ sub usage()
 
 target_init(\@global_settings);
 
-while (@ARGV>0) {
-  my $arg=shift @ARGV;
+foreach(@ARGV) {
+  my $arg=$_;
   # General options
   if ($arg eq "--nobanner") {
     $opt_no_banner=1;