diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index b3c4e011..f27d38e3 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -8,9 +8,9 @@
     <include name="commons-io.jar"/>
     <include name="commons-logging.jar"/>
     <include name="ehcache-1.2.jar"/>
-    <include name="junit-3.7.jar"/>
+    <include name="junit4.jar"/>
     <include name="mail.jar"/>
-    <include name="servlet-*.jar"/>
+    <include name="servlet-api.jar"/>
     <include name="velocity-1.5-dev.jar"/>
   </fileset>
 </project>
diff --git a/lib/README b/lib/README
index 7dddd326..735d5c56 100644
--- a/lib/README
+++ b/lib/README
@@ -1,39 +1,19 @@
 Required external libraries
 ---------------------------
 
-The samskivert code requires the following external Java libraries (JAR
-files) to be placed here in the lib/ directory or in the shared library
-directory specified in the build.xml file (${java.libraries}).
+The samskivert code requires external Java libraries (JAR files) to be placed
+here in the lib/ directory. The libraries are enumerated in the
+etc/libs-incl.xml file and must be named as specified in that file.
 
-* Library: Jakarta Regular Expression package (org.apache.regexp)
-           http://jakarta.apache.org/regexp/
-  Depends: Used by various services.
+Those libraries can be obtained at the following websites:
 
-* Library: JDBC driver
-           MM MySQL driver: http://mmmysql.sourceforge.net/
-  Depends: Required by com.samskivert.jdbc.*
+- http://ant.apache.org/
+- http://ehcache.sourceforge.net/
+- http://jakarta.apache.org/commons
+- http://jakarta.apache.org/velocity
+- http://java.sun.com/products/javamail/
+- http://java.sun.com/products/servlet/
+- http://junit.org/
 
-* Library: WebMacro web template system
-           http://www.webmacro.org/
-  Depends: Required by com.samskivert.webmacro.*
-
-* Library: Jakarta Commons Collections (org.apache.commons.collections)
-           http://jakarta.apache.org/commons
-  Depends: Required by com.samskivert.velocity.*
-
-* Library: Velocity web template system
-           http://jakarta.apache.org/velocity
-  Depends: Required by com.samskivert.velocity.*
-
-* Library: Java API for XML Processing (JAXP) 1.1
-           http://java.sun.com/xml/download.html
-           (Only crimson.jar and jaxp.jar are required. xalan.jar may
-            safely be excluded.)
-  Depends: Required by com.samskivert.xml.*
-
-Once the jar files are in place (regardless of what they are named), the
-build system will automatically include them in the compile-time
-classpath.
-
---
-$Id$
+The latest versions of the libraries should work, except where specific
+versions are specified in the libs-incl.xml file.