diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e1f6205b..c3aafcc4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,19 @@ endif (LUA51_FOUND)
 
 check_function_exists (random  HAVE_RANDOM)
 check_function_exists (srandom HAVE_SRANDOM)
+# Some systems include uuid automatically (OS X), others need the includes/library
 check_function_exists (uuid_unparse_lower HAVE_UUID)
+if (NOT HAVE_UUID)
+  message ("-- Looking for libuuid")
+  find_path    (UUID_INCLUDE_DIR   uuid/uuid.h)
+  find_library (UUID_LIBRARY NAMES uuid)
+  if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+    message ("-- Found libuuid: ${UUID_LIBRARY}")
+    set (HAVE_UUID true)
+    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${UUID_INCLUDE_DIR})
+    set (TASK_LIBRARIES    ${TASK_LIBRARIES}   ${UUID_LIBRARY})
+  endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+endif (NOT HAVE_UUID)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (LINUX true)
diff --git a/ChangeLog b/ChangeLog
index 6405ecedc..b77b012a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@
    commands, and therefore update shadow files (thanks to Aikido Guy).
  + Applied patch for Bug #770, which fixed a broken build (thanks to Christopher
    J. Pilkington).
+ + Applied patch for Bug #771, which looks for libuuid if uuid_unparse_lower is
+   not located (thanks to Christopher J. Pilkington).
 
 # Untracked Bugs, biggest first.