diff --git a/.bashrc b/.bashrc
index a51c385..3ef02f9 100755
--- a/.bashrc
+++ b/.bashrc
@@ -5,3 +5,16 @@ alias grep='grep --color'
 
 # Case insensitive matching
 shopt -s nocaseglob
+
+PS1='\[\t\]'
+# Prompt color based on location
+if [ "$SSH_CONNECTION" == "" ]; then
+  # Yellow prompt for local login
+  PS1="$PS1\[\e[1;32m\][\u@\h \W]"
+else
+  PS1="$PS1\[\e[1;33m\][\u@\h \W]"
+fi
+
+# Ripped from Doug - color based on return code
+PS1="$PS1\$(if [ \$? = 0 ]; then echo -e \"\$\"; else echo -e \"\[\033[0;31m\]\$\"; fi)\[\033[0m\] "
+