diff --git a/include/czmq_prelude.h b/include/czmq_prelude.h
index 611db9e84..e672f5ea5 100644
--- a/include/czmq_prelude.h
+++ b/include/czmq_prelude.h
@@ -695,10 +695,7 @@ char *if_indextoname (unsigned int ifindex, char *ifname);
 #if defined (__UTYPE_OSX) && !defined (HAVE_UUID)
 #   define HAVE_UUID 1
 #endif
-#if defined (__UTYPE_FREEBSD) && !defined (HAVE_UUID)
-#   define HAVE_UUID 1
-#endif
-#if defined (HAVE_UUID)
+#if defined (HAVE_UUID) || defined (__UTYPE_FREEBSD)
 #   if defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD) || defined(__UTYPE_OPENBSD)
 #       include <uuid.h>
 #   elif defined __UTYPE_HPUX
diff --git a/src/zuuid.c b/src/zuuid.c
index 4cd55b840..f71f3a7c3 100644
--- a/src/zuuid.c
+++ b/src/zuuid.c
@@ -47,7 +47,7 @@ zuuid_new (void)
     assert (sizeof (uuid) == ZUUID_LEN);
     UuidCreate (&uuid);
     zuuid_set (self, (byte *) &uuid);
-#elif defined (HAVE_UUID) && !defined (__UTYPE_FREEBSD)
+#elif defined (HAVE_UUID)
     uuid_t uuid;
     assert (sizeof (uuid) == ZUUID_LEN);
     uuid_generate (uuid);