diff -Naur base-files-orig/etc/defaults/etc/bash.bashrc base-files/etc/defaults/etc/bash.bashrc
--- base-files-orig/etc/defaults/etc/bash.bashrc	2009-12-09 20:31:19.000000000 +0000
+++ base-files/etc/defaults/etc/bash.bashrc	2010-02-19 13:40:47.937500000 +0000
@@ -9,3 +9,41 @@
 # always be found at /etc/defaults/etc/bash.bashrc
 
 # System-wide .bashrc file
+
+# Shell dependent settings
+case "`echo "_$0" | /usr/bin/tr '[:upper:]' '[:lower:]' | /usr/bin/sed -e 's/^_//'`" in
+bash     | -bash     | */bash | \
+bash.exe | -bash.exe | */bash.exe )
+        # Set a default prompt of: user@host and current_directory
+        PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[33m\]\w\[\e[0m\]\n\$ '
+        ;;
+ksh*     | -ksh*     | */ksh* | \
+ksh*.exe | -ksh*.exe | */ksh*.exe )
+        # Set a default prompt of: user@host and current_directory
+        PS1='^[]0;${PWD}^G
+^[[32m${USER}@${HOSTNAME} ^[[33m${PWD}^[[0m
+$ '
+        ;;
+zsh*     | -zsh*     | */zsh* | \
+zsh*.exe | -zsh*.exe | */zsh*.exe )
+        # Set a default prompt of: user@host, a command counter, and current_directory
+        PS1='(%n@%m)[%h] %~ %% '
+        ;;
+sh     | -sh     | */sh | \
+sh.exe | -sh.exe | */sh.exe )
+        # Set a simple prompt
+        PS1='$ '
+        ;;
+* )
+        # Sorry, this shell has no defaults in /etc/bash.bashrc
+        #  feel free to add your own.
+
+        # If you have some recommendations for what these defaults
+        #  should be, please contact cygwin@cygwin.com with the
+        #  shell details and what you would like added.
+
+        # Thanks
+
+        PS1='$ '
+        ;;
+esac
diff -Naur base-files-orig/etc/defaults/etc/profile base-files/etc/defaults/etc/profile
--- base-files-orig/etc/defaults/etc/profile	2009-12-09 20:31:19.000000000 +0000
+++ base-files/etc/defaults/etc/profile	2010-02-19 13:42:14.750000000 +0000
@@ -91,25 +91,14 @@
 	# Set a HOSTNAME variable
 	HOSTNAME=`hostname`
 	export HOSTNAME
-
-	# Set a default prompt of: user@host and current_directory
-	PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[33m\]\w\[\e[0m\]\n\$ '
 	;;
 ksh*     | -ksh*     | */ksh* | \
 ksh*.exe | -ksh*.exe | */ksh*.exe )
 	# Set a HOSTNAME variable
 	typeset -l HOSTNAME
-
-	# Set a default prompt of: user@host and current_directory
-	PS1='^[]0;${PWD}^G
-^[[32m${USER}@${HOSTNAME} ^[[33m${PWD}^[[0m
-$ '
 	;;
 zsh*     | -zsh*     | */zsh* | \
 zsh*.exe | -zsh*.exe | */zsh*.exe )
-	# Set a default prompt of: user@host, a command counter, and current_directory
-	PS1='(%n@%m)[%h] %~ %% '
-	
 	# Set SHELL if not set
 	if [ ! -z "${ZSH_NAME}" -a -z "${SHELL}" ]; then
 		SHELL="/bin/zsh"
@@ -118,8 +107,6 @@
 	;;
 sh     | -sh     | */sh | \
 sh.exe | -sh.exe | */sh.exe )
-	# Set a simple prompt
-	PS1='$ '
 	;;
 * )
 	# Sorry, this shell has no defaults in /etc/profile,
@@ -130,8 +117,6 @@
 	#  shell details and what you would like added.
 
 	# Thanks
-	
-	PS1='$ '
 	;;
 esac
 
diff -Naur base-files-orig/etc/defaults/etc/skel/.bash_profile base-files/etc/defaults/etc/skel/.bash_profile
--- base-files-orig/etc/defaults/etc/skel/.bash_profile	2009-12-09 20:31:19.000000000 +0000
+++ base-files/etc/defaults/etc/skel/.bash_profile	2010-02-19 13:43:53.187500000 +0000
@@ -14,11 +14,6 @@
 
 # ~/.bash_profile: executed by bash for login shells.
 
-# source the system wide bashrc if it exists
-if [ -e /etc/bash.bashrc ] ; then
-  source /etc/bash.bashrc
-fi
-
 # source the users bashrc if it exists
 if [ -e "${HOME}/.bashrc" ] ; then
   source "${HOME}/.bashrc"
diff -Naur base-files-orig/etc/defaults/etc/skel/.bashrc base-files/etc/defaults/etc/skel/.bashrc
--- base-files-orig/etc/defaults/etc/skel/.bashrc	2009-12-09 20:31:19.000000000 +0000
+++ base-files/etc/defaults/etc/skel/.bashrc	2010-02-19 13:51:20.859375000 +0000
@@ -12,6 +12,11 @@
 # would be benificial to all, please feel free to send
 # a patch to the cygwin mailing list.
 
+# source the system wide bashrc if it exists
+if [ -e /etc/bash.bashrc ] ; then
+  source /etc/bash.bashrc
+fi
+
 # User dependent .bashrc file
 
 # Environment Variables