diff --git a/ChangeLog b/ChangeLog
index 641140a4f..dce93bb61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@ Features
  + Protects against interrupt during critical DB commit and sync operations.
  + The 'push', 'pull' and 'merge' commands now generate a 'deprecated' message.
  + Rewritten task-sync(5) man page, listing sync options and setup guidelines..
+ + Now properly uses the libc version of uuid_create and uuid_to_string for
+   FreeBSD (thanks to Pietro Cerutti).
 
 Bugs
  + #1195 Random seed not random enough - removed all random number code (thanks
diff --git a/src/util.cpp b/src/util.cpp
index 21480df0d..1353db329 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -235,19 +235,19 @@ int autoComplete (
 // representation is always lowercase anyway.
 // For the implementation details, refer to
 // http://svnweb.freebsd.org/base/head/sys/kern/kern_uuid.c
-#ifdef __FreeBSD__
+#ifdef FREEBSD
 const std::string uuid ()
 {
-    uuid_t id;
-    uint32_t status;
-    char *buffer (0);
-    uuid_create (&id, &status);
-    uuid_to_string (&id, &buffer, &status);
+  uuid_t id;
+  uint32_t status;
+  char *buffer (0);
+  uuid_create (&id, &status);
+  uuid_to_string (&id, &buffer, &status);
 
-    std::string res (buffer);
-    free (buffer);
+  std::string res (buffer);
+  free (buffer);
 
-    return res;
+  return res;
 }
 #else
 
diff --git a/src/util.h b/src/util.h
index 28de3cc65..1d749b50f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,11 +28,12 @@
 #ifndef INCLUDED_UTIL
 #define INCLUDED_UTIL
 
+#include <cmake.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <sys/types.h>
-#ifdef __FreeBSD__
+#ifdef FREEBSD
 #include <uuid.h>
 #else
 #include <uuid/uuid.h>