diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
index 365d89157..5aef3f16c 100644
--- a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
+++ b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
@@ -1,5 +1,5 @@
 //
-// $Id: ComponentBundlerTask.java,v 1.5 2002/03/08 22:36:43 mdb Exp $
+// $Id: ComponentBundlerTask.java,v 1.6 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.cast.bundle.tools;
 
@@ -22,7 +22,7 @@ import com.samskivert.util.HashIntMap;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.Tuple;
 
-import org.apache.commons.util.StreamUtils;
+import org.apache.commons.io.StreamUtils;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
diff --git a/src/java/com/threerings/media/image/ToolkitLoader.java b/src/java/com/threerings/media/image/ToolkitLoader.java
index 850a9fb04..b835b9246 100644
--- a/src/java/com/threerings/media/image/ToolkitLoader.java
+++ b/src/java/com/threerings/media/image/ToolkitLoader.java
@@ -1,5 +1,5 @@
 //
-// $Id: ToolkitLoader.java,v 1.1 2001/12/07 01:33:29 mdb Exp $
+// $Id: ToolkitLoader.java,v 1.2 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.media;
 
@@ -11,7 +11,7 @@ import java.awt.Toolkit;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.util.StreamUtils;
+import org.apache.commons.io.StreamUtils;
 
 /**
  * Loads images using the default AWT toolkit (for compatibility with
diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
index bedd90895..b97a2de4f 100644
--- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
@@ -1,5 +1,5 @@
 //
-// $Id: TileSetBundler.java,v 1.4 2002/02/05 20:29:09 mdb Exp $
+// $Id: TileSetBundler.java,v 1.5 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.media.tile.bundle.tools;
 
@@ -22,7 +22,7 @@ import org.apache.commons.digester.Digester;
 import org.apache.commons.digester.Rule;
 import org.apache.commons.digester.RuleSetBase;
 
-import org.apache.commons.util.StreamUtils;
+import org.apache.commons.io.StreamUtils;
 
 import com.samskivert.io.NestableIOException;
 import com.samskivert.io.PersistenceException;
diff --git a/src/java/com/threerings/presents/dobj/ObjectAccessException.java b/src/java/com/threerings/presents/dobj/ObjectAccessException.java
index 44303ee67..fe8841b12 100644
--- a/src/java/com/threerings/presents/dobj/ObjectAccessException.java
+++ b/src/java/com/threerings/presents/dobj/ObjectAccessException.java
@@ -1,9 +1,9 @@
 //
-// $Id: ObjectAccessException.java,v 1.3 2002/02/02 09:42:36 mdb Exp $
+// $Id: ObjectAccessException.java,v 1.4 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.presents.dobj;
 
-import org.apache.commons.util.exception.NestableException;
+import org.apache.commons.lang.exception.NestableException;
 
 /**
  * An object access exception is delivered when an object is not
diff --git a/src/java/com/threerings/presents/io/ObjectStreamException.java b/src/java/com/threerings/presents/io/ObjectStreamException.java
index 755ceca55..1bd47bab7 100644
--- a/src/java/com/threerings/presents/io/ObjectStreamException.java
+++ b/src/java/com/threerings/presents/io/ObjectStreamException.java
@@ -1,5 +1,5 @@
 //
-// $Id: ObjectStreamException.java,v 1.5 2001/10/16 16:44:20 mdb Exp $
+// $Id: ObjectStreamException.java,v 1.6 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.presents.io;
 
@@ -7,8 +7,8 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import org.apache.commons.util.exception.Nestable;
-import org.apache.commons.util.exception.NestableDelegate;
+import org.apache.commons.lang.exception.Nestable;
+import org.apache.commons.lang.exception.NestableDelegate;
 
 /**
  * The object stream exception is used to communicate an error in
diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java
index 29d3e31d6..098ba1bce 100644
--- a/src/java/com/threerings/resource/ResourceManager.java
+++ b/src/java/com/threerings/resource/ResourceManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ResourceManager.java,v 1.11 2002/03/15 19:12:16 mdb Exp $
+// $Id: ResourceManager.java,v 1.12 2002/04/01 16:49:26 mdb Exp $
 
 package com.threerings.resource;
 
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.commons.util.StreamUtils;
+import org.apache.commons.io.StreamUtils;
 import com.samskivert.util.StringUtil;
 
 /**