Index: dbus/dbus-internals.c
--- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
+++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
@@ -512,6 +512,14 @@
   uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
   
   _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
+
+  /* brand UUID as variant DCE 1.1 */
+  uuid->as_bytes[8] &= ~0xc0;
+  uuid->as_bytes[8] |= (0x02 << 6);
+
+  /* brand UUID as version 4 */
+  uuid->as_bytes[6] &= ~0xf0;
+  uuid->as_bytes[6] |= (0x04 << 4);
 }
 
 /**
Index: dbus/dbus-sysdeps-util-unix.c
--- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
+++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
@@ -31,6 +31,7 @@
 #include "dbus-test.h"
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
@@ -526,6 +527,8 @@
 #   else
 #       if defined(NAME_MAX)
 	 name_max = NAME_MAX;
+#       elif defined(MAXPATHLEN)
+	 name_max = MAXPATHLEN;
 #       else
 #           error "buffer size for readdir_r cannot be determined"
 #       endif