diff --git a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java b/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
index fad7685..51ef25c 100644
--- a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
+++ b/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
@@ -89,6 +89,10 @@ public abstract class FindAllQuery<T extends PersistentRecord>
             _builder.newQuery(new SelectClause<T>(_type, _marsh.getPrimaryKeyFields(), _clauses));
             PreparedStatement stmt = _builder.prepare(conn);
             try {
+                if (PersistenceContext.DEBUG) {
+                    log.info("KEY QUERY: " + stmt);
+                }
+
                 ResultSet rs = stmt.executeQuery();
                 while (rs.next()) {
                     Key<T> key = _marsh.makePrimaryKey(rs);
@@ -141,6 +145,10 @@ public abstract class FindAllQuery<T extends PersistentRecord>
 
                 // and execute it
                 try {
+                    if (PersistenceContext.DEBUG) {
+                        log.info("VALUE QUERY: " + stmt);
+                    }
+
                     ResultSet rs = stmt.executeQuery();
                     int cnt = 0, dups = 0;
                     while (rs.next()) {
@@ -193,6 +201,10 @@ public abstract class FindAllQuery<T extends PersistentRecord>
             List<T> result = new ArrayList<T>();
             PreparedStatement stmt = _builder.prepare(conn);
             try {
+                if (PersistenceContext.DEBUG) {
+                    log.info("QUERY: " + stmt);
+                }
+
                 ResultSet rs = stmt.executeQuery();
                 while (rs.next()) {
                     result.add(_marsh.createObject(rs));
diff --git a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java b/src/java/com/samskivert/jdbc/depot/FindOneQuery.java
index 7bf34fc..0f068ae 100644
--- a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java
+++ b/src/java/com/samskivert/jdbc/depot/FindOneQuery.java
@@ -32,6 +32,8 @@ import com.samskivert.jdbc.JDBCUtil;
 import com.samskivert.jdbc.depot.clause.QueryClause;
 import com.samskivert.jdbc.depot.clause.SelectClause;
 
+import static com.samskivert.jdbc.depot.Log.log;
+
 /**
  * The implementation of {@link DepotRepository#find) functionality.
  */
@@ -66,6 +68,10 @@ public class FindOneQuery<T extends PersistentRecord>
     {
         PreparedStatement stmt = _builder.prepare(conn);
         try {
+            if (PersistenceContext.DEBUG) {
+                log.info("KEY QUERY: " + stmt);
+            }
+
             T result = null;
             ResultSet rs = stmt.executeQuery();
             if (rs.next()) {
diff --git a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
index 962b1bf..088f71a 100644
--- a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
+++ b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
@@ -49,6 +49,9 @@ import static com.samskivert.jdbc.depot.Log.log;
  */
 public class PersistenceContext
 {
+    /** Allow toggling of query logging and other debug output via a system property. */
+    public static final boolean DEBUG = Boolean.getBoolean("com.samskivert.jdbc.depot.debug");
+
     /** Map {@link TableGenerator} instances by name. */
     public HashMap<String, TableGenerator> tableGenerators = new HashMap<String, TableGenerator>();