diff -ru mod_perl-1.27/Makefile.PL mod_perl-1.27-cyg/Makefile.PL
--- mod_perl-1.27/Makefile.PL	Sun Jun  2 04:13:25 2002
+++ mod_perl-1.27-cyg/Makefile.PL	Tue Jun 18 15:20:52 2002
@@ -1070,6 +1070,7 @@
     iedit "t/conf/httpd.conf", "s: \./t(\\S*): $PWD/t\$1:";
 
     for (qw(User Group)) {
+        $$_ = qq{"$$_"} if $$_ =~ /\s/; # User takes one parameter
 	iedit "t/conf/httpd.conf", "s/^$_ .*/$_ $$_/"; 
     }
     conf_append(<<EOF) if $IsBenSSL;
@@ -1117,9 +1118,8 @@
 
     require "lib/mod_perl_hooks.pm";
     my @list = mod_perl::hooks();
-    if ($Is_Cygwin) {
-    } 
-    else {
+
+    unless ($Is_Cygwin) { # test doesn't seem to be needed, works for me (Per Einar)
 	@list == @mod_perl_hooks or die "Edit of lib/mod_perl_hooks.pm failed $!\n";
     }
 
@@ -1979,11 +1979,7 @@
     return if $Is_Win32;
 
     #print STDERR "-e @_\n";
-    if ($Is_Cygwin) {
-    system $^X, "-e", "@_", $file;
-    } else {    
     system $^X, "-pi~", "-e", "@_", $file;
-    }
 }
 
 sub win32_setup {
diff -ru mod_perl-1.27/apaci/mod_perl.config.sh mod_perl-1.27-cyg/apaci/mod_perl.config.sh
--- mod_perl-1.27/apaci/mod_perl.config.sh	Thu May 23 05:20:54 2002
+++ mod_perl-1.27-cyg/apaci/mod_perl.config.sh	Wed Jun 12 12:35:27 2002
@@ -1,3 +1,4 @@
+#!/bin/sh
 ##
 ##  mod_perl.config.sh -- mod_perl configuration transformation script
 ##  Written by Ralf S. Engelschall <rse@apache.org>
diff -ru mod_perl-1.27/t/net/perl/action.pl mod_perl-1.27-cyg/t/net/perl/action.pl
--- mod_perl-1.27/t/net/perl/action.pl	Thu Dec 30 02:46:32 1999
+++ mod_perl-1.27-cyg/t/net/perl/action.pl	Sat Jun 15 00:00:08 2002
@@ -1,4 +1,4 @@
-
+#!perl
 my $r = Apache->request;
 $r->content_type("text/plain");
 $r->send_http_header;
diff -ru mod_perl-1.27/t/net/perl/api.pl mod_perl-1.27-cyg/t/net/perl/api.pl
--- mod_perl-1.27/t/net/perl/api.pl	Wed May 29 19:14:24 2002
+++ mod_perl-1.27-cyg/t/net/perl/api.pl	Sat Jun 15 00:00:21 2002
@@ -1,3 +1,4 @@
+#!perl
 use Apache ();
 use Apache::Constants qw(:server :common :methods);
 use Apache::test;
diff -ru mod_perl-1.27/t/net/perl/cgi.pl.PL mod_perl-1.27-cyg/t/net/perl/cgi.pl.PL
--- mod_perl-1.27/t/net/perl/cgi.pl.PL	Mon Nov 30 14:00:52 1998
+++ mod_perl-1.27-cyg/t/net/perl/cgi.pl.PL	Sat Jun 15 00:00:38 2002
@@ -1,4 +1,4 @@
-
+#!perl
 use CGI ();
 use strict;
 
diff -ru mod_perl-1.27/t/net/perl/constants.pl mod_perl-1.27-cyg/t/net/perl/constants.pl
--- mod_perl-1.27/t/net/perl/constants.pl	Sat Dec 23 00:43:26 2000
+++ mod_perl-1.27-cyg/t/net/perl/constants.pl	Sat Jun 15 00:00:45 2002
@@ -1,3 +1,4 @@
+#!perl
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl test.pl'
 
diff -ru mod_perl-1.27/t/net/perl/dirty-script.cgi mod_perl-1.27-cyg/t/net/perl/dirty-script.cgi
--- mod_perl-1.27/t/net/perl/dirty-script.cgi	Thu Jan 25 08:31:01 2001
+++ mod_perl-1.27-cyg/t/net/perl/dirty-script.cgi	Sat Jun 15 00:00:58 2002
@@ -1,3 +1,4 @@
+#!perl
 local $^W = 0;
 unshift @INC, 
        -e "dirty-lib" ? '.' :
diff -ru mod_perl-1.27/t/net/perl/dirty-test.cgi mod_perl-1.27-cyg/t/net/perl/dirty-test.cgi
--- mod_perl-1.27/t/net/perl/dirty-test.cgi	Wed Sep 13 09:48:54 2000
+++ mod_perl-1.27-cyg/t/net/perl/dirty-test.cgi	Sat Jun 15 00:01:03 2002
@@ -1,3 +1,4 @@
+#!perl
 
 unshift @INC, 
        -e "dirty-lib" ? '.' :
diff -ru mod_perl-1.27/t/net/perl/echo mod_perl-1.27-cyg/t/net/perl/echo
--- mod_perl-1.27/t/net/perl/echo	Sat Dec  6 18:57:32 1997
+++ mod_perl-1.27-cyg/t/net/perl/echo	Tue Jun 18 15:07:48 2002
@@ -1,3 +1,4 @@
+#!perl
 my $r = Apache->request;
 $r->content_type("text/plain");
 $r->send_http_header;
diff -ru mod_perl-1.27/t/net/perl/file.pl mod_perl-1.27-cyg/t/net/perl/file.pl
--- mod_perl-1.27/t/net/perl/file.pl	Thu Dec 30 01:53:06 1999
+++ mod_perl-1.27-cyg/t/net/perl/file.pl	Sat Jun 15 00:01:16 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 
diff -ru mod_perl-1.27/t/net/perl/have_module.pl mod_perl-1.27-cyg/t/net/perl/have_module.pl
--- mod_perl-1.27/t/net/perl/have_module.pl	Thu Dec 24 20:20:17 1998
+++ mod_perl-1.27-cyg/t/net/perl/have_module.pl	Sat Jun 15 00:01:35 2002
@@ -1,3 +1,4 @@
+#!perl
 my $r = shift;
 $r->send_http_header('text/plain');
 my $module = $r->args;
diff -ru mod_perl-1.27/t/net/perl/hooks.pl mod_perl-1.27-cyg/t/net/perl/hooks.pl
--- mod_perl-1.27/t/net/perl/hooks.pl	Thu Aug 13 03:49:09 1998
+++ mod_perl-1.27-cyg/t/net/perl/hooks.pl	Sat Jun 15 00:01:40 2002
@@ -1,3 +1,4 @@
+#!perl
 use Apache ();
 my $tests = 0;
 
diff -ru mod_perl-1.27/t/net/perl/io/dir_config.pl mod_perl-1.27-cyg/t/net/perl/io/dir_config.pl
--- mod_perl-1.27/t/net/perl/io/dir_config.pl	Thu May 14 05:07:00 1998
+++ mod_perl-1.27-cyg/t/net/perl/io/dir_config.pl	Tue Jun 18 15:05:19 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 use Data::Dumper ();
diff -ru mod_perl-1.27/t/net/perl/io/include.pl mod_perl-1.27-cyg/t/net/perl/io/include.pl
--- mod_perl-1.27/t/net/perl/io/include.pl	Sat Dec  6 18:57:35 1997
+++ mod_perl-1.27-cyg/t/net/perl/io/include.pl	Tue Jun 18 15:05:23 2002
@@ -1,4 +1,4 @@
-
+#!perl
 
 use Apache::Include ();
 print "Content-type: text/plain\n\n";
diff -ru mod_perl-1.27/t/net/perl/io/redir.pl mod_perl-1.27-cyg/t/net/perl/io/redir.pl
--- mod_perl-1.27/t/net/perl/io/redir.pl	Sat Dec  6 18:57:36 1997
+++ mod_perl-1.27-cyg/t/net/perl/io/redir.pl	Tue Jun 18 15:05:37 2002
@@ -1,4 +1,4 @@
-
+#!perl
 #test internal redirects
 
 my %loc = (
diff -ru mod_perl-1.27/t/net/perl/io/redir1.pl mod_perl-1.27-cyg/t/net/perl/io/redir1.pl
--- mod_perl-1.27/t/net/perl/io/redir1.pl	Mon Jul 16 19:11:04 2001
+++ mod_perl-1.27-cyg/t/net/perl/io/redir1.pl	Tue Jun 18 15:05:13 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 my $r = shift;
 $r->internal_redirect('/perl/io/redir2.pl');
diff -ru mod_perl-1.27/t/net/perl/io/redir2.pl mod_perl-1.27-cyg/t/net/perl/io/redir2.pl
--- mod_perl-1.27/t/net/perl/io/redir2.pl	Mon Jul 16 19:11:04 2001
+++ mod_perl-1.27-cyg/t/net/perl/io/redir2.pl	Tue Jun 18 15:05:32 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 my $r = shift;
 $r->send_http_header('text/plain');
diff -ru mod_perl-1.27/t/net/perl/io/ssi1.pl mod_perl-1.27-cyg/t/net/perl/io/ssi1.pl
--- mod_perl-1.27/t/net/perl/io/ssi1.pl	Sat Dec  6 18:57:36 1997
+++ mod_perl-1.27-cyg/t/net/perl/io/ssi1.pl	Tue Jun 18 15:05:42 2002
@@ -1,4 +1,4 @@
-
+#!perl
 sub SSI::one {
     print "Content-type: text/html\n\n";
 
diff -ru mod_perl-1.27/t/net/perl/io/ssi2.pl mod_perl-1.27-cyg/t/net/perl/io/ssi2.pl
--- mod_perl-1.27/t/net/perl/io/ssi2.pl	Sat Dec  6 18:57:37 1997
+++ mod_perl-1.27-cyg/t/net/perl/io/ssi2.pl	Tue Jun 18 15:05:46 2002
@@ -1,4 +1,4 @@
-
+#!perl
 sub SSI::two {
     print "Content-type: text/html\n\n";
 
diff -ru mod_perl-1.27/t/net/perl/log.pl mod_perl-1.27-cyg/t/net/perl/log.pl
--- mod_perl-1.27/t/net/perl/log.pl	Fri Aug 28 22:36:32 1998
+++ mod_perl-1.27-cyg/t/net/perl/log.pl	Sat Jun 15 00:01:45 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 my $i = 0;
diff -ru mod_perl-1.27/t/net/perl/module.pl mod_perl-1.27-cyg/t/net/perl/module.pl
--- mod_perl-1.27/t/net/perl/module.pl	Thu Jan 21 01:03:16 1999
+++ mod_perl-1.27-cyg/t/net/perl/module.pl	Sat Jun 15 00:01:50 2002
@@ -1,4 +1,4 @@
-
+#!perl
 use Apache::test;
 
 my $r = shift;
diff -ru mod_perl-1.27/t/net/perl/noenv/test.pl mod_perl-1.27-cyg/t/net/perl/noenv/test.pl
--- mod_perl-1.27/t/net/perl/noenv/test.pl	Thu Apr 30 14:06:35 1998
+++ mod_perl-1.27-cyg/t/net/perl/noenv/test.pl	Tue Jun 18 15:09:23 2002
@@ -1,3 +1,4 @@
+#!perl
 shift->send_http_header("text/plain");
 
 unless($My::config_is_perl) {
diff -ru mod_perl-1.27/t/net/perl/qredirect.pl mod_perl-1.27-cyg/t/net/perl/qredirect.pl
--- mod_perl-1.27/t/net/perl/qredirect.pl	Tue Feb 10 22:36:24 1998
+++ mod_perl-1.27-cyg/t/net/perl/qredirect.pl	Sat Jun 15 00:01:56 2002
@@ -1,4 +1,4 @@
-
+#!perl
 use CGI;
 use strict;
 my $q = new CGI;
diff -ru mod_perl-1.27/t/net/perl/raw.pl mod_perl-1.27-cyg/t/net/perl/raw.pl
--- mod_perl-1.27/t/net/perl/raw.pl	Sat Dec  6 18:57:32 1997
+++ mod_perl-1.27-cyg/t/net/perl/raw.pl	Sat Jun 15 00:02:01 2002
@@ -1,3 +1,4 @@
+#!perl
 
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/plain\n\n";
diff -ru mod_perl-1.27/t/net/perl/request-cookie.pl mod_perl-1.27-cyg/t/net/perl/request-cookie.pl
--- mod_perl-1.27/t/net/perl/request-cookie.pl	Thu Dec 30 20:50:43 1999
+++ mod_perl-1.27-cyg/t/net/perl/request-cookie.pl	Sat Jun 15 00:02:06 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 
 use Apache::test;
diff -ru mod_perl-1.27/t/net/perl/request-param.pl mod_perl-1.27-cyg/t/net/perl/request-param.pl
--- mod_perl-1.27/t/net/perl/request-param.pl	Thu Dec 30 20:54:10 1999
+++ mod_perl-1.27-cyg/t/net/perl/request-param.pl	Sat Jun 15 00:02:11 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 
diff -ru mod_perl-1.27/t/net/perl/request-upload.pl mod_perl-1.27-cyg/t/net/perl/request-upload.pl
--- mod_perl-1.27/t/net/perl/request-upload.pl	Thu Dec 30 20:51:16 1999
+++ mod_perl-1.27-cyg/t/net/perl/request-upload.pl	Sat Jun 15 00:02:15 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 
diff -ru mod_perl-1.27/t/net/perl/rwrite.pl mod_perl-1.27-cyg/t/net/perl/rwrite.pl
--- mod_perl-1.27/t/net/perl/rwrite.pl	Fri Mar 20 00:09:06 1998
+++ mod_perl-1.27-cyg/t/net/perl/rwrite.pl	Sat Jun 15 00:02:24 2002
@@ -1,3 +1,4 @@
+#!perl
 my $r = shift;
 $r->send_http_header("text/plain");
 
diff -ru mod_perl-1.27/t/net/perl/server_error.pl mod_perl-1.27-cyg/t/net/perl/server_error.pl
--- mod_perl-1.27/t/net/perl/server_error.pl	Thu May 23 06:14:14 2002
+++ mod_perl-1.27-cyg/t/net/perl/server_error.pl	Sat Jun 15 00:02:29 2002
@@ -1,3 +1,4 @@
+#!perl
 my $r = shift;
 
 $r->send_http_header("text/plain");
diff -ru mod_perl-1.27/t/net/perl/ssi.pl mod_perl-1.27-cyg/t/net/perl/ssi.pl
--- mod_perl-1.27/t/net/perl/ssi.pl	Sat Dec  6 18:57:33 1997
+++ mod_perl-1.27-cyg/t/net/perl/ssi.pl	Sat Jun 15 00:02:35 2002
@@ -1,4 +1,4 @@
-
+#!perl
 my($r, @args) = @_;
 print "Hi, I've been pulled in by mod_include via Apache::Include<p>\n";
 print "I'm cached by Apache::Registry in package `", __PACKAGE__, "'<p>\n";
diff -ru mod_perl-1.27/t/net/perl/sym.pl mod_perl-1.27-cyg/t/net/perl/sym.pl
--- mod_perl-1.27/t/net/perl/sym.pl	Fri Jul  6 22:45:45 2001
+++ mod_perl-1.27-cyg/t/net/perl/sym.pl	Sat Jun 15 00:02:39 2002
@@ -1,3 +1,4 @@
+#!perl
 eval {
     require Apache::Symbol;
 };
diff -ru mod_perl-1.27/t/net/perl/throw_error.pl mod_perl-1.27-cyg/t/net/perl/throw_error.pl
--- mod_perl-1.27/t/net/perl/throw_error.pl	Sun Apr 26 02:32:22 1998
+++ mod_perl-1.27-cyg/t/net/perl/throw_error.pl	Sat Jun 15 00:02:49 2002
@@ -1,3 +1,4 @@
+#!perl
 my $r = shift;
 
 $r->custom_response(500, "/perl/server_error.pl");
diff -ru mod_perl-1.27/t/net/perl/tie_table.pl mod_perl-1.27-cyg/t/net/perl/tie_table.pl
--- mod_perl-1.27/t/net/perl/tie_table.pl	Fri Nov 13 04:27:57 1998
+++ mod_perl-1.27-cyg/t/net/perl/tie_table.pl	Sat Jun 15 00:02:53 2002
@@ -1,3 +1,4 @@
+#!perl
 use Apache::test;
 
 use strict;
diff -ru mod_perl-1.27/t/net/perl/uri.pl mod_perl-1.27-cyg/t/net/perl/uri.pl
--- mod_perl-1.27/t/net/perl/uri.pl	Fri Jul 17 22:48:42 1998
+++ mod_perl-1.27-cyg/t/net/perl/uri.pl	Sat Jun 15 00:02:57 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 $|++;
diff -ru mod_perl-1.27/t/net/perl/util.pl mod_perl-1.27-cyg/t/net/perl/util.pl
--- mod_perl-1.27/t/net/perl/util.pl	Tue Mar 26 15:45:37 2002
+++ mod_perl-1.27-cyg/t/net/perl/util.pl	Sat Jun 15 00:03:01 2002
@@ -1,3 +1,4 @@
+#!perl
 use strict;
 use Apache::test;
 $|++;