diff --git a/bashrc b/bashrc
index 6f78c80a..a47ea391 100755
--- a/bashrc
+++ b/bashrc
@@ -136,12 +136,6 @@ hostname && uptime
 
 # Source before mentioned locations if they exist.
 
-# Don't check for mail!
-unset MAILCHECK
-
-# Enable core files.
-ulimit -c unlimited
-
 # .environment
 if [ -f ~/.environment ]; then
     source ~/.environment
@@ -152,6 +146,16 @@ if [ -f ~/.bash_environment ]; then
     source ~/.bash_environment
 fi
 
+# $uname should tell which OS is used.
+$uname=`uname`
+
+# Don't check for mail!
+unset MAILCHECK
+
+# Enable core files.
+ulimit -c unlimited
+
+
 # More colours :D
 if [[ $TERM == 'xterm' ]]; then
 export TERM=xterm-256color
diff --git a/zshrc b/zshrc
index 63aca325..c08408e8 100755
--- a/zshrc
+++ b/zshrc
@@ -58,12 +58,6 @@ hostname && uptime
 
 # Source before mentioned locations if they exist.
 
-# Don't check for mail!
-unset MAILCHECK
-
-# Enable core files
-ulimit -c unlimited
-
 # .environment
 if [ -f ~/.environment ]; then
     source ~/.environment
@@ -79,6 +73,16 @@ if [ -f ~/.zshenv ]; then
     source ~/.zshenv
 fi
 
+# uname should be readable in $uname 
+uname=`uname`
+
+# Don't check for mail!
+unset MAILCHECK
+
+# Enable core files.
+ulimit -c unlimited
+
+
 #More colours :D
 if [[ $TERM == 'xterm' ]]; then
 export TERM=xterm-256color