diff --git a/README.md b/README.md
index 27642a5..c943d54 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,4 @@ abbiefetch will attempt to gather as much information as possible on systems tha
 | `haiku` | Haiku | | 1.1.0 | Partial | |
 | `windows` | Microsoft Windows | | 1.2.0 | Full | Relies on wmic.exe and systeminfo.exe |
 | `windows/cygwin` | Microsoft Windows | Cygwin | 1.2.0 | Partial | Relies on wmic.exe and systeminfo.exe, issues with machine detection |
+| `illumos` | illumos | | `master` | Preliminary | |
diff --git a/kernel_info.5 b/kernel_info.5
index 7cc9731..82d6d83 100644
--- a/kernel_info.5
+++ b/kernel_info.5
@@ -4,3 +4,6 @@ fi
 if [ -n "$(uname -s)" ] && [ -z "$kernel" ]; then
 	kernel="$(uname -s)"
 fi
+if [ "$system_type" = "illumos" ]; then
+	kernel="$(uname -v)"
+fi
diff --git a/system_detection.2 b/system_detection.2
index 86ac2aa..c4972db 100644
--- a/system_detection.2
+++ b/system_detection.2
@@ -41,3 +41,6 @@ if [ "$?" -eq 0 ] && [ "$system_type" = "unknown" ]; then
 		subtype="cygwin"
 	fi
 fi
+if [ "$(uname -o)" = "illumos" ] && [ "$system_type" = "unknown" ]; then
+	system_type="illumos"
+fi