diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index f0815d6d..b83e32e3 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -19,6 +19,7 @@
+
diff --git a/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java b/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
index dfaeec8c..e62e3a61 100644
--- a/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
+++ b/src/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
@@ -21,11 +21,11 @@
package com.threerings.parlor.rating.server.persist;
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.expression.ColumnExp;
import com.threerings.parlor.rating.util.Percentiler;
diff --git a/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java b/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
index 9f569ae8..7536d180 100644
--- a/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
+++ b/src/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
@@ -25,13 +25,13 @@ import java.sql.Timestamp;
import com.samskivert.util.StringUtil;
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.Index;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.Index;
+import com.samskivert.depot.expression.ColumnExp;
@Entity(indices={
@Index(name="ixPlayerId", fields={ RatingRecord.PLAYER_ID })
diff --git a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
index f84cc279..28acbf30 100644
--- a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
+++ b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
@@ -36,18 +36,18 @@ import com.google.inject.Singleton;
import com.samskivert.util.IntSet;
-import com.samskivert.jdbc.depot.DepotRepository;
-import com.samskivert.jdbc.depot.PersistenceContext;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.Where;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
-import com.samskivert.jdbc.depot.operator.Conditionals.GreaterThan;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Logic.And;
+import com.samskivert.depot.DepotRepository;
+import com.samskivert.depot.PersistenceContext;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.Where;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.Conditionals.Equals;
+import com.samskivert.depot.operator.Conditionals.GreaterThan;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Logic.And;
import com.threerings.parlor.rating.util.Percentiler;
diff --git a/src/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java b/src/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
index 4111814c..390c11ad 100644
--- a/src/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
+++ b/src/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
@@ -3,11 +3,11 @@
package com.threerings.stats.server.persist;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.expression.ColumnExp;
@Computed @Entity
public class MaxStatCodeRecord extends PersistentRecord {
diff --git a/src/java/com/threerings/stats/server/persist/StatRecord.java b/src/java/com/threerings/stats/server/persist/StatRecord.java
index 49adbe9b..a366a374 100644
--- a/src/java/com/threerings/stats/server/persist/StatRecord.java
+++ b/src/java/com/threerings/stats/server/persist/StatRecord.java
@@ -21,12 +21,12 @@
package com.threerings.stats.server.persist;
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.expression.ColumnExp;
@Entity(name="STATS")
public class StatRecord extends PersistentRecord
diff --git a/src/java/com/threerings/stats/server/persist/StatRepository.java b/src/java/com/threerings/stats/server/persist/StatRepository.java
index abdcb211..d75b2471 100644
--- a/src/java/com/threerings/stats/server/persist/StatRepository.java
+++ b/src/java/com/threerings/stats/server/persist/StatRepository.java
@@ -18,17 +18,17 @@ import com.samskivert.io.ByteArrayOutInputStream;
import com.samskivert.util.IntMap;
import com.samskivert.util.IntMaps;
-import com.samskivert.jdbc.depot.DatabaseException;
-import com.samskivert.jdbc.depot.DepotRepository;
-import com.samskivert.jdbc.depot.DuplicateKeyException;
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.PersistenceContext;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.Where;
-import com.samskivert.jdbc.depot.expression.FunctionExp;
+import com.samskivert.depot.DatabaseException;
+import com.samskivert.depot.DepotRepository;
+import com.samskivert.depot.DuplicateKeyException;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.PersistenceContext;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.Where;
+import com.samskivert.depot.expression.FunctionExp;
import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
diff --git a/src/java/com/threerings/stats/server/persist/StringCodeRecord.java b/src/java/com/threerings/stats/server/persist/StringCodeRecord.java
index 888e5a65..86fc3e67 100644
--- a/src/java/com/threerings/stats/server/persist/StringCodeRecord.java
+++ b/src/java/com/threerings/stats/server/persist/StringCodeRecord.java
@@ -21,13 +21,13 @@
package com.threerings.stats.server.persist;
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.UniqueConstraint;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.UniqueConstraint;
+import com.samskivert.depot.expression.ColumnExp;
@Entity(name="STRING_CODES", uniqueConstraints={
@UniqueConstraint(fieldNames={ StringCodeRecord.STAT_CODE, StringCodeRecord.VALUE }),