diff --git a/ChangeLog b/ChangeLog
index 2f5c32e36..73ef4c4ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,8 +120,8 @@
    Clarke).
  + Fixed bug #788, which reported regex and readline versions, even though they
    are not used.
- + Fixed bug #792, #793 & #794, so that cmake now recognizes and builds on
-   Solaris (thanks to Owen Clarke).
+ + Fixed bug #792, #793, #794 and #795, so that cmake now recognizes and builds
+   on Solaris (thanks to Owen Clarke).
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.
diff --git a/src/util.cpp b/src/util.cpp
index 5ec08c462..d0a06d6ae 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -230,12 +230,22 @@ const std::string uuid ()
   uuid_t id;
   uuid_generate (id);
   char buffer[100] = {0};
+#ifdef SOLARIS
+  uuid_unparse (id, buffer);
+#else
   uuid_unparse_lower (id, buffer);
+#endif
 
   // Bug found by Steven de Brouwer.
   buffer[36] = '\0';
 
+#ifdef SOLARIS
+  std::string data = std::string (buffer);
+  std::transform (data.begin(), data.end(), data.begin(), ::tolower);
+  return data;
+#else
   return std::string (buffer);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////