diff --git a/neofetch b/neofetch
index 48b96d21..e8a7b2bc 100755
--- a/neofetch
+++ b/neofetch
@@ -1217,8 +1217,8 @@ get_distro() {
     [[ $distro ]] || distro="$os (Unknown)"
 
     # Get OS architecture.
-    case $os in
-        Solaris|AIX|Haiku|IRIX|FreeMiNT)
+    case $os-$kernel_name in
+        Solaris-*|AIX-*|Haiku-*|IRIX-*|FreeMiNT-*|BSD-FreeBSD)
             machine_arch=$(uname -p)
         ;;