diff --git a/contrib/gitweb/gitweb.conf b/contrib/gitweb/gitweb.conf
index 5ed8dbc..c88e4cc 100644
--- a/contrib/gitweb/gitweb.conf
+++ b/contrib/gitweb/gitweb.conf
@@ -3,8 +3,13 @@
 # Include this in gitweb.conf
 # See doc/3-faq-tips-etc.mkd for more info
 
+# please note that the author does not have personal experience with gitweb
+# and does not use it.  Some testing may be required.  Patches welcome but
+# please make sure they are tested against a "github" version of gitolite
+# and not an RPM or a DEB, for obvious reasons.
+
 # HOME of the gitolite user
-my $gl_home = "/home/git";
+my $gl_home = $ENV{HOME} = "/home/git";
 
 # the following variables are needed by gitolite; please edit before using
 
@@ -28,9 +33,9 @@ $ENV{GL_BINDIR} = "$gl_home/bin";
 $ENV{GL_USER} = $cgi->remote_user || "gitweb";
 
 # now get gitolite stuff in...
-use lib $ENV{GL_BINDIR};
-use gitolite_rc;
-use gitolite;
+unshift @INC, $ENV{GL_BINDIR};
+require gitolite_rc;    gitolite_rc -> import;
+require gitolite;       gitolite    -> import;
 
 # set project root etc. absolute paths
 $ENV{GL_REPO_BASE_ABS} = ( $REPO_BASE =~ m(^/) ? $REPO_BASE : "$gl_home/$REPO_BASE" );