diff --git a/src/condor_gridmanager/gahp-client.cpp b/src/condor_gridmanager/gahp-client.cpp
index d2c66ce629..a2a694a6b9 100644
--- a/src/condor_gridmanager/gahp-client.cpp
+++ b/src/condor_gridmanager/gahp-client.cpp
@@ -820,6 +820,16 @@ GahpServer::Startup()
free( tmp_char );
}
+ // GLOBUS_LOCATION needs to be set for the blahp; otherwise, it defaults to /opt/globus,
+ // which is likely never correct
+ tmp_char = param("GLOBUS_LOCATION");
+ if ( tmp_char ) {
+ newenv.SetEnv( "GLOBUS_LOCATION", tmp_char );
+ free( tmp_char );
+ } else if (getenv("GLOBUS_LOCATION") == NULL) {
+ newenv.SetEnv( "GLOBUS_LOCATION", "/usr" );
+ }
+
// For amazon ec2 ca authentication
tmp_char = param("GAHP_SSL_CAFILE");
if( tmp_char ) {