diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2011-02-24 15:42:15.836052389 +0100
@@ -1,3 +1,12 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ;
+then
+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
+
+. ${libexecdir}/globus-sh-tools.sh
+
+${GLOBUS_SH_PERL:-perl} ${setupdir}/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2011-02-24 15:29:56.165941771 +0100
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Paths;
+
+my $gk_conf = "$Globus::Core::Paths::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Paths::sbindir
+  -logfile $Globus::Core::Paths::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Paths::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Paths::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Paths::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Paths::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Paths::sysconfdir/grid-services";
    print "Done\n";
 }