diff --git a/bash/bashrc.common b/bash/bashrc.common
new file mode 100644
index 0000000..7078f87
--- /dev/null
+++ b/bash/bashrc.common
@@ -0,0 +1,27 @@
+
+# Import the Git prompt shell functions. These can be found
+# @github:git/git/contrib/completion/git_prompt.sh
+if [ -f $HOME/.git_prompt.sh ]; then
+    source $HOME/.git_prompt.sh
+    export PS1='\e[34m\u@\h \e[0m[\e[32m\w$(__git_ps1 " \e[33m(%s)")\e[0m] '
+else
+    export PS1='\e[34m\u@\h \e[0m[\e[32m\w\e[0m] '
+fi
+
+# Add $HOME/bin to PATH
+if [[ ":$PATH:" != *":$HOME/bin:"* ]]
+then
+    export PATH=$HOME/bin:$PATH
+fi
+
+# Add ls coloring
+if [ -f $HOME/.bashrc.lscolors ]; then
+    source $HOME/.bashrc.lscolors
+fi
+
+# Keep system specific aliases in a seperate file called .aliases
+# If .aliases exists it will envoked by the next line:
+if [ -f $HOME/.aliases ]; then
+    source $HOME/.aliases 
+fi
+
diff --git a/bashrc.lscolors b/bash/bashrc.lscolors
old mode 100755
new mode 100644
similarity index 99%
rename from bashrc.lscolors
rename to bash/bashrc.lscolors
index c68989c..1bf46d6
--- a/bashrc.lscolors
+++ b/bash/bashrc.lscolors
@@ -1,4 +1,3 @@
-#!/bin/bash
 
 if [[ "`uname`" == *"Darwin"* ]]
 then