diff --git a/src/resources/setup.sh b/src/resources/setup.sh
index e73d4e6..b18902c 100644
--- a/src/resources/setup.sh
+++ b/src/resources/setup.sh
@@ -13,11 +13,11 @@ GHN_HOME=${SMARTGEAR_ROOT}/SmartGears
 CONTAINER_FILENAME="container.xml"
 CONTAINER_XML=${GHN_HOME}/${CONTAINER_FILENAME}
 
-ENV_VARIABLES="export CATALINA_OPTS=\"-Xmx2000m -Xms2000m\"
-export GHN_HOME=${GHN_HOME}
-export CATALINA_PID=${SMARTGEAR_ROOT}/${TOMCAT_PID_FILENAME}
-export CATALINA_HOME=${SMARTGEAR_ROOT}/${TOMCAT_DST_FOLDER}
-export BUNDLE_HOME=${SMARTGEAR_ROOT}"
+CATALINA_OPTS_BASHRC="export CATALINA_OPTS=\"-Xmx2000m -Xms2000m\""
+GHN_HOME_BASHRC="export GHN_HOME=${GHN_HOME}"
+CATALINA_PID_BASHRC="export CATALINA_PID=${SMARTGEAR_ROOT}/${TOMCAT_PID_FILENAME}"
+CATALINA_HOME_BASHRC="export CATALINA_HOME=${SMARTGEAR_ROOT}/${TOMCAT_DST_FOLDER}"
+BUNDLE_HOME_BASHRC="export BUNDLE_HOME=${SMARTGEAR_ROOT}"
 
 function showhelp {
 	echo -e "\nUsage:  setup.sh [-n <hostname>] [-f | -h] \n"
@@ -93,15 +93,27 @@ if [ $force ]; then
 
 	echo -e "\n"
 	echo "Adding the following variables to environment..."
-	echo "${ENV_VARIABLES}"
-	echo "${ENV_VARIABLES}" >> ~/.bashrc
+	sed -i '/export CATALINA_OPT/d' ~/.bashrc
+	echo "${CATALINA_OPTS_BASHRC}"
+	echo "${CATALINA_OPTS_BASHRC}" >> ~/.bashrc
+	sed -i '/export GHN_HOME/d' ~/.bashrc
+	echo "${GHN_HOME_BASHRC}"
+	echo "${GHN_HOME_BASHRC}" >> ~/.bashrc
+	sed -i '/export CATALINA_PID/d' ~/.bashrc
+	echo "${CATALINA_PID_BASHRC}"
+	echo "${CATALINA_PID_BASHRC}" >> ~/.bashrc
+	sed -i '/export CATALINA_HOME/d' ~/.bashrc
+	echo "${CATALINA_HOME_BASHRC}"
+	echo "${CATALINA_HOME_BASHRC}" >> ~/.bashrc
+	sed -i '/export BUNDLE_HOME/d' ~/.bashrc
+	echo "${BUNDLE_HOME_BASHRC}"
+	echo "${BUNDLE_HOME_BASHRC}" >> ~/.bashrc
 	echo "done."
 	
 	echo -e "\n"
 	echo "Creating GHN_HOME ${GHN_HOME}"
 	mkdir -p ${GHN_HOME}
 	
-	
 	echo -e "\n"
 	echo "Loading new environment..."
 	source ~/.bashrc
@@ -139,6 +151,12 @@ else
 	echo ""
 	echo "Add the following variables to your ~/.bashrc"
 	echo "${ENV_VARIABLES}"
+	echo "${CATALINA_OPTS_BASHRC}"
+	echo "${GHN_HOME_BASHRC}"
+	echo "${CATALINA_PID_BASHRC}"
+	echo "${CATALINA_HOME_BASHRC}"
+	echo "${BUNDLE_HOME_BASHRC}"
+	
 	
 	echo ""
 	echo "Create GHN_HOME ${GHN_HOME}"