diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java
index 8626a3c..c876771 100644
--- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java
+++ b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java
@@ -359,9 +359,9 @@ public class GenRecordTask extends Task
     protected static final String FIELDS_END = MARKER + "FIELDS END";
 
     /** A regular expression for matching the package declaration. */
-    protected static final Pattern PACKAGE_PATTERN = Pattern.compile("^\\s*package\\s+(\\S+)\\W");
+    protected static final Pattern PACKAGE_PATTERN = Pattern.compile("^\\s*package\\s+(\\w+)\\W");
 
     /** A regular expression for matching the class or interface declaration. */
     protected static final Pattern NAME_PATTERN = Pattern.compile(
-        "^\\s*public\\s+(?:abstract\\s+)?(interface|class)\\s+(\\S+)(\\W|$)(<)?");
+        "^\\s*public\\s+(?:abstract\\s+)?(interface|class)\\s+(\\w+)(\\W|$)");
 }