diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d667098c..2855d45f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set (DARWIN true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
   set (FREEBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  set (SOLARIS true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/ChangeLog b/ChangeLog
index 884046eaf..70bd83bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,7 @@
    Clarke).
  + Fixed bug #788, which reported regex and readline versions, even though they
    are not used.
+ + Fixed bug #792, so that cmake now recognizes Solaris (thanks to Owen Clarke).
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.