diff --git a/bash/common b/bash/common
index 65f3ec2..74bad2c 100644
--- a/bash/common
+++ b/bash/common
@@ -1,5 +1,5 @@
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/usr/local/mongodb/bin:/usr/local/pgsql/bin:/usr/X11/bin:/opt/local/bin
-export CDPATH=".:~"
+export CDPATH=".:${HOME}"
 
 system_name=`uname -s` # Sets 'Darwin' or 'Linux' etc
 
diff --git a/bash/exports b/bash/exports
index 10eb71d..97a2bde 100644
--- a/bash/exports
+++ b/bash/exports
@@ -2,7 +2,7 @@ if [ $system_name = 'Darwin' ]; then
   export EDITOR='mate -w'
   export PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/:$PATH"
   export PATH="/Library/PostgreSQL8/bin/:$PATH"
-  export CDPATH="$CDPATH:~/Code/*:~/Sites/*"
+  CDPATH="${CDPATH}:${HOME}/Code/Mocra/:${HOME}/Code/Personal:${HOME}/Sites/Mocra/:${HOME}/Sites/Personal/"
   export GEM_OPEN_EDITOR='mate'
 else  
   export EDITOR='nano -w'