Index: modules/metadata/mod_usertrack.c
===================================================================
--- modules/metadata/mod_usertrack.c	(revision 661940)
+++ modules/metadata/mod_usertrack.c	(working copy)
@@ -99,15 +99,21 @@
     /* 1024 == hardcoded constant */
     char cookiebuf[1024];
     char *new_cookie;
-    const char *rname = ap_get_remote_host(r->connection, r->per_dir_config,
-                                           REMOTE_NAME, NULL);
+    const char *unique_id;
     cookie_dir_rec *dcfg;
 
     dcfg = ap_get_module_config(r->per_dir_config, &usertrack_module);
 
-    /* XXX: hmm, this should really tie in with mod_unique_id */
-    apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%" APR_TIME_T_FMT, rname,
-                 apr_time_now());
+    /* Use mod_unique_id if available */
+    if((unique_id = apr_table_get(r->subprocess_env, "UNIQUE_ID"))){
+         apr_cpystrn(cookiebuf, unique_id, sizeof(cookiebuf));
+    }
+    else{
+        const char *rname = ap_get_remote_host(r->connection, r->per_dir_config,
+                                               REMOTE_NAME, NULL);
+        apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%" APR_TIME_T_FMT, rname,
+                     apr_time_now());
+    }
 
     if (cls->expires) {