diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index c552b2ab..4966cf37 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -487,8 +487,9 @@ struct class {
 	struct expression *expr;
 
 	/* Expression used to compute subclass identifiers for spawning
-	   and subsequent matching. */
-	struct expression *spawn;
+	   and to do subclass matching. */
+	struct expression *submatch;
+	int spawning;
 	
 	struct group *group;