diff -ru jetty-5.1.3/build.xml jetty-5.1.3-patched/build.xml
--- jetty-5.1.3/build.xml	2005-04-07 12:53:50.000000000 -0400
+++ jetty-5.1.3-patched/build.xml	2005-05-15 15:30:55.000000000 -0400
@@ -23,6 +23,7 @@
   <property name="dist"           value="${basedir}/dist"/>
   <property name="contrib"        value="${basedir}/contrib"/>
   <property name="extra"          value="${basedir}/extra"/>
+  <property name="extra-ext"      value="${basedir}/extra/ext"/>
   <property name="classes"        value="${basedir}/classes"/>
   <property name="javadoc"        value="${basedir}/javadoc"/>
   <property name="logs"           value="${basedir}/logs"/>
@@ -69,6 +70,12 @@
         <exclude name="javax.xml.jaxp.jar"/>
         <exclude name="crimson.jar"/>
        </fileset>
+      <fileset dir="${extra-ext}">
+        <include name="*.jar"/>
+        <include name="*.JAR"/>
+        <include name="*.zip"/>
+        <include name="*.ZIP"/>
+      </fileset>
     </path>
    
     <path id="classpath">
diff -ru jetty-5.1.3/etc/jetty.xml jetty-5.1.3-patched/etc/jetty.xml
--- jetty-5.1.3/etc/jetty.xml	2005-03-29 13:36:28.000000000 -0500
+++ jetty-5.1.3-patched/etc/jetty.xml	2005-05-15 15:30:55.000000000 -0400
@@ -24,7 +24,7 @@
       <Call name="add">
         <Arg>
           <New class="org.mortbay.log.OutputStreamLogSink">
-            <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.jetty.log</Set>
+            <Set name="filename">/var/log/jetty5/yyyy_mm_dd.jetty.log</Set>
             <Set name="retainDays">90</Set>
             <Set name="append">true</Set>
             <Set name="logLabels">true</Set>
@@ -64,7 +64,7 @@
       </New>
     </Arg>
   </Call>
-
+  -->
 
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <!-- Add a HTTPS SSL listener on port 8443                           -->
@@ -192,7 +192,7 @@
   <!-- =============================================================== -->
   <Set name="RequestLog">
     <New class="org.mortbay.http.NCSARequestLog">
-      <Arg><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Arg>
+      <Arg>/var/log/jetty5/yyyy_mm_dd.request.log</Arg>
       <Set name="retainDays">90</Set>
       <Set name="append">true</Set>
       <Set name="extended">false</Set>
diff -ru jetty-5.1.3/extra/unix/bin/jetty.sh jetty-5.1.3-patched/extra/unix/bin/jetty.sh
--- jetty-5.1.3/extra/unix/bin/jetty.sh	2003-09-16 06:03:34.000000000 -0400
+++ jetty-5.1.3-patched/extra/unix/bin/jetty.sh	2005-05-15 15:30:55.000000000 -0400
@@ -155,6 +155,7 @@
         Jetty                    \
         jetty3                   \
         Jetty3                   \
+        jetty-5                  \
         "
         
   JETTY_HOME=
@@ -184,10 +185,10 @@
 #####################################################
 # Check that jetty is where we think it is
 #####################################################
-if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ] 
+if [ ! -r /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE ] 
 then
    echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
-   echo "** ERROR:  $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
+   echo "** ERROR:  /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE is not readable!"
    exit 1
 fi
 
@@ -362,7 +363,7 @@
                 echo $VERSION:$J
             done
         done
-    done | sort | tail -1 > $TMPJ
+    done | sort | tail -n 1 > $TMPJ
     JAVA=`cat $TMPJ | cut -d: -f2`
     JVERSION=`cat $TMPJ | cut -d: -f1`
 
@@ -397,7 +398,7 @@
     exit 1
 fi
 
-JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
+JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -n 1)" : '.*1\.\([0-9]\)'`
 
 #####################################################
 # See if JETTY_PORT is defined
@@ -422,11 +423,11 @@
 #####################################################
 if [ $JAVA_VERSION -lt 4 ]
 then
-   CP=$(ls $JETTY_HOME/ext/*.jar $JETTY_HOME/lib/*.jar | \
+   CP=$(ls /usr/share/jetty-5/lib/*.jar | \
       egrep -v org.mortbay.jetty.jar | \
       paste -s -d"$PATH_SEPARATOR" - )
 else
-   CP=$(ls $JETTY_HOME/ext/*.jar $JETTY_HOME/lib/*.jar | \
+   CP=$(ls /usr/share/jetty-5/lib/*.jar | \
       egrep -v org.mortbay.jetty-jdk1.2.jar\|crimson.jar\|javax.xml.jaxp.jar | \
       paste -s -d"$PATH_SEPARATOR" - )
 fi