diff --git a/VERSION b/VERSION
index c705dce..543f19d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-9.2.0.3
-9.2.0.3
+9.2.0.4
+9.2.0.4
diff --git a/app.manifest b/app.manifest
index 6ef5050..7dbd1e4 100644
--- a/app.manifest
+++ b/app.manifest
@@ -29,7 +29,7 @@
         "id": {
             "group": null,
             "name": "TA-nix",
-            "version": "9.2.0.3"
+            "version": "9.2.0.4"
         },
         "license": {
             "name": "Splunk Software License Agreement",
diff --git a/bin/version.sh b/bin/version.sh
index e37812e..1df3c2f 100755
--- a/bin/version.sh
+++ b/bin/version.sh
@@ -15,6 +15,7 @@ if [ "$KERNEL" = "Linux" ] ; then
 	machine_arch=$(uname -p)
 	os_release=$(uname -r)
 	os_version=$(uname -v)
+  distro_name=Linux
 	[ -n "$NAME" ] && distro_name=$NAME
 	[ -n "$VERSION_ID" ] && os_release=$VERSION_ID
 	[ -n "$VERSION_ID" ] && os_version=$VERSION_ID
@@ -24,48 +25,48 @@ if [ "$KERNEL" = "Linux" ] ; then
 	which dpkg > /dev/null 2>&1 && machine_arch=$(dpkg --print-architecture)
 	[ "$NAME" = "Arch Linux" -o "$NAME" = "Arch Linux ARM" ] && machine_arch=$(uname -m | sed -r "s/(armv7l|aarch64)/arm64/;s/x86_64/amd64/")
 
-	CMD="eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; echo $machine_arch; echo $os_release; echo $os_version; echo $distro_name"
+	CMD="eval date ; echo $distro_name ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; echo $machine_arch; echo $os_release; echo $os_version"
 elif [ "$KERNEL" = "Darwin" ] ; then
 	assertHaveCommand date
 	assertHaveCommand uname
 	assertHaveCommand sw_vers
 	os_release=$(sw_vers --productVersion)
-	CMD="eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p; echo $os_release; echo $os_release"
+	CMD="eval date ; echo MacOS ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p; echo $os_release; echo $os_release"
 elif [ "$KERNEL" = "SunOS" ]  [ "$KERNEL" = "FreeBSD" ] ; then
 	assertHaveCommand date
 	assertHaveCommand uname
-	CMD='eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p'
+	CMD='eval date ; echo $KERNEL ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v ; eval uname -p;'
 elif [ "$KERNEL" = "HP-UX" ] ; then
 	# HP-UX lacks -p switch.
 	assertHaveCommand date
 	assertHaveCommand uname
-	CMD='eval date ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v'
+	CMD='eval date ; echo HP-UX ; eval uname -m ; eval uname -r ; eval uname -s ; eval uname -v'
 elif [ "$KERNEL" = "AIX" ] ; then
 	# AIX uses oslevel for version and release switch.
 	assertHaveCommand date
 	assertHaveCommand uname
-	CMD='eval date ; eval uname -m ; eval oslevel -r ; eval uname -s ; eval oslevel -s'
+	CMD='eval date ; echo AIX ; eval uname -m ; eval oslevel -r ; eval uname -s ; eval oslevel -s'
 fi
 
 # Get the date.
 # shellcheck disable=SC2016
 PARSE_0='NR==1 {DATE=$0}'
 # shellcheck disable=SC2016
-PARSE_1='NR==2 {MACH_HW_NAME="machine_hardware_name=\"" $0 "\""}'
+PARSE_1='NR==2 {DISTRO="distro_name=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_2='NR==3 {OS_REL="os_release=\"" $0 "\"";KERN_REL="kernel_release=\"" $0 "\""}'
+PARSE_2='NR==3 {MACH_HW_NAME="machine_hardware_name=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_3='NR==4 {OS_NAME="os_name=\"" $0 "\""}'
+PARSE_3='NR==4 {OS_REL="os_release=\"" $0 "\"";KERN_REL="kernel_release=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_4='NR==5 {OS_VER="os_version=\"" $0 "\"";KERN_VER="kernel_version=\"" $0 "\""}'
+PARSE_4='NR==5 {OS_NAME="os_name=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_5='NR==6 {MACH_ARCH_NAME="machine_architecture_name=\"" $0 "\""}'
+PARSE_5='NR==6 {OS_VER="os_version=\"" $0 "\"";KERN_VER="kernel_version=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_6='NR==7 {OS_REL="os_release=\"" $0 "\""}'
+PARSE_6='NR==7 {MACH_ARCH_NAME="machine_architecture_name=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_7='NR==8 {OS_VER="os_version=\"" $0 "\""}'
+PARSE_7='NR==8 {OS_REL="os_release=\"" $0 "\""}'
 # shellcheck disable=SC2016
-PARSE_8='NR==9 {DISTRO="distro_name=\"" $0 "\""}'
+PARSE_8='NR==9 {OS_VER="os_version=\"" $0 "\""}'
 
 MASSAGE="$PARSE_0 $PARSE_1 $PARSE_2 $PARSE_3 $PARSE_4 $PARSE_5 $PARSE_6 $PARSE_7 $PARSE_8"
 
diff --git a/default/app.conf b/default/app.conf
index 388abc4..80bdaf3 100644
--- a/default/app.conf
+++ b/default/app.conf
@@ -17,7 +17,7 @@ docs_section_override = AddOns:released
 
 [launcher]
 author = Michael Erdely
-version = 9.2.0.3
+version = 9.2.0.4
 description = Technical Add-on for Unix and Linux
 
 #[package]
@@ -26,5 +26,5 @@ description = Technical Add-on for Unix and Linux
 
 [id]
 name = TA-unix
-version = 9.2.0.3
+version = 9.2.0.4
 
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 296d838..678c514 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,9 +1,20 @@
 # Technical Add-on for Unix and Linux
 
+## Version 9.2.0.4
+
+Make distro_name work everywhere
+
+Changes:
+
+* For MacOS, print MacOS for distro_name
+* For others, print $KERNEL for distro_name
+
 ## Version 9.2.0.3
 
 Fix bug in 9.2.0.2
 
+Changes:
+
 * Add code I forgot for machine_arch for Linux
 * Add Makefile to make making releases easier