diff --git a/bashrc b/bashrc
index d53ef74b..605f045f 100644
--- a/bashrc
+++ b/bashrc
@@ -115,6 +115,11 @@ if [[ $UNAME != Darwin ]]; then
     alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
 fi
 
+if [[ $UNAME = Darwin ]]; then
+    alias ll="ls -alFH"
+    alias l="ls -CF"
+fi
+
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
@@ -146,6 +151,10 @@ if [[ $UNAME != Darwin ]]; then
     who -H -w -u
 fi
 
+if [[ $UNAME = Darwin ]]; then
+    who -H -u
+fi
+
 #####   Environment                 7RS56S  #####
 # Environment should be placed to .environment or .bash_environment.
 
diff --git a/zshrc b/zshrc
index 5cba7ba5..e8bea6ef 100644
--- a/zshrc
+++ b/zshrc
@@ -83,10 +83,15 @@ zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
 hostname
 uptime
 echo ""
+
 if [[ $UNAME != Darwin  ]] then;
     who -H -w -u
 fi
 
+if [[ $UNAME = Darwin ]]; then
+    who -H -u
+fi
+
 #####   Environment                 7RS56S  #####
 # Environment should be placed to .environment or .zsh_environment (or .zshenv).
 
@@ -300,6 +305,11 @@ if [[ "$UNAME" != "Darwin" ]]; then
     alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
 fi
 
+if [[ $UNAME = Darwin ]]; then
+    alias ll="ls -alFH"
+    alias l="ls -CF"
+fi
+
 # Add an "alert" alias for long running commands.  Use like so:
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'