diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 1cc4624..ed44cc0 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -25,7 +25,7 @@
 #include <types/stick_table.h>
 
 struct stksess *stksess_new(struct stktable *t, struct stktable_key *key);
-void stksess_key(struct stktable *t, struct stksess *ts, struct stktable_key *key);
+void stksess_setkey(struct stktable *t, struct stksess *ts, struct stktable_key *key);
 void stksess_free(struct stktable *t, struct stksess *ts);
 
 int stktable_init(struct stktable *t);
diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index b63b790..bbb9d0d 100644
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -48,7 +48,11 @@
 	size_t default_size;      /* default key size */
 };
 
-/* sticky session */
+/* Sticky session.
+ * Any additional data related to the stuck session is installed *before*
+ * stksess (with negative offsets). This allows us to run variable-sized
+ * keys and variable-sized data without making use of intermediate pointers.
+ */
 struct stksess {
 	int sid;                  /* id of server to use for this session */
 	unsigned int expire;      /* session expiration date */
@@ -70,6 +74,7 @@
 	int nopurge;              /* if non-zero, don't purge sticky sessions when full */
 	int exp_next;             /* next expiration date (ticks) */
 	int expire;               /* time to live for sticky sessions (milliseconds) */
+	int data_size;            /* the size of the data that is prepended *before* stksess */
 };
 
 /*** The definitions below should probably be better placed in pattern.h ***/