diff --git a/CHANGES b/CHANGES
index 9a8a93b..6aa8beb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Changes for 3.1.1:
+
+* Fixed issue #82: Use the kernel version as a fallback
+
 Changes for 3.1.0:
 
 * New feature: Support for generating C code.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edcf920..c347185 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,8 +82,15 @@ elseif (UNIX)
   # Get Linux distribution info.
   GetOsReleaseInfo(LINUX_DIST_NAME LINUX_DIST_VER )
 
+  if("${LINUX_DIST_VER}" STREQUAL "")
+    # Use the kernel version as a fallback
+    execute_process(COMMAND uname -r
+      OUTPUT_VARIABLE LINUX_DIST_VER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+
   # Extract distribution MAJOR version
-  get_major_version(${LINUX_DIST_VER} LINUX_DIST_VER_MAJOR)
+  get_major_version("${LINUX_DIST_VER}" LINUX_DIST_VER_MAJOR)
 
   MESSAGE( STATUS "LINUX_DIST_NAME:             " ${LINUX_DIST_NAME} )
   MESSAGE( STATUS "LINUX_DIST_VER:              " ${LINUX_DIST_VER} )