diff --git a/CHANGELOG.md b/CHANGELOG.md
index f09204b8..f58fe482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 
 - Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)**
 - [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)**
+- Use `$SSH_TTY` for terminal detection if machine is connected via SSH.
 
 **GPU**
 
diff --git a/neofetch b/neofetch
index 99f66bc4..6019a6d5 100755
--- a/neofetch
+++ b/neofetch
@@ -243,12 +243,13 @@ get_model() {
         ;;
 
         "Mac OS X") 
-            if [[ "$(kextstat | grep "FakeSMC")" ]]; then
+            if [[ "$(kextstat | grep "FakeSMC")" != "" ]]; then
                 model="Hackintosh (SMBIOS: $(sysctl -n hw.model))"
             else
                 model="$(sysctl -n hw.model)"
             fi
         ;;
+
         "iPhone OS")
             case "$machine_arch" in
                 "iPad1,1") model="iPad" ;;
@@ -1647,15 +1648,20 @@ get_term() {
 
     # Check $PPID for terminal emulator.
     while [[ -z "$term" ]]; do
-        parent="$(get_ppid "$parent")"
-        name="$(get_process_name "$parent")"
-        case "${name// }" in
-            "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;;
-            "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;;
-            "ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) break ;;
-            "gnome-terminal-") term="gnome-terminal" ;;
-            *) term="${name##*/}" ;;
-        esac
+        if [[ "$SSH_CONNECTION" ]]; then
+            term="$SSH_TTY"
+        else
+            parent="$(get_ppid "$parent")"
+            [[ -z "$parent" ]] && break
+            name="$(get_process_name "$parent")"
+            case "${name// }" in
+                "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;;
+                "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;;
+                "ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) break ;;
+                "gnome-terminal-") term="gnome-terminal" ;;
+                *) term="${name##*/}" ;;
+            esac
+        fi
     done
 
     # Log that the function was run.