diff --git a/jack b/jack
index 383c13c..a6c5af6 160000
--- a/jack
+++ b/jack
@@ -1 +1 @@
-Subproject commit 383c13c50ab517b79cf28bd3e594a9e6e21f5051
+Subproject commit a6c5af6347fcf05c6df059b79e60aca205ecdcce
diff --git a/jackd/clientengine.c b/jackd/clientengine.c
index ed9456a..40a2ea0 100644
--- a/jackd/clientengine.c
+++ b/jackd/clientengine.c
@@ -599,7 +599,7 @@ jack_setup_client_control (jack_engine_t *engine, int fd, ClientType type, const
 	client->control->timed_out = 0;
 
         if (jack_uuid_empty (uuid)) {
-                uuid_generate (client->control->uuid);
+                jack_uuid_generate (client->control->uuid);
         } else {
                 jack_uuid_copy (client->control->uuid, uuid);
         }
diff --git a/jackd/engine.c b/jackd/engine.c
index 460a80f..7a416ce 100644
--- a/jackd/engine.c
+++ b/jackd/engine.c
@@ -4423,7 +4423,7 @@ fallback:
 next:
 	shared->ptype_id = engine->control->port_types[i].ptype_id;
 	jack_uuid_copy (shared->client_id, req->x.port_info.client_id);
-        uuid_generate (shared->uuid);
+        jack_uuid_generate (shared->uuid);
 	shared->flags = req->x.port_info.flags;
 	shared->latency = 0;
 	shared->capture_latency.min = shared->capture_latency.max = 0;
diff --git a/libjack/uuid.c b/libjack/uuid.c
index a951a12..c069137 100644
--- a/libjack/uuid.c
+++ b/libjack/uuid.c
@@ -22,6 +22,12 @@
 
 #include "internal.h"
 
+void
+jack_uuid_generate (jack_uuid_t uuid)
+{
+        uuid_generate (uuid);
+}
+
 int
 jack_uuid_empty (const jack_uuid_t u)
 {