diff --git a/etc/bashrc b/etc/bashrc
index c11be4621..965a08265 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright held by original author
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -33,9 +33,12 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=1.6.x
+export WM_PROJECT_VERSION=1.6-ext
 
-################################################################################
+# helps to easily write #ifdefs to detect a dev-version
+export FOAM_DEV=1
+
+###############################################################################
 # USER EDITABLE PART
 #
 # either set $FOAM_INST_DIR before sourcing this file or set
@@ -92,6 +95,8 @@ export WM_COMPILER_LIB_ARCH=
 
 # Compilation options (architecture, precision, optimised, debug or profiling)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+export WM_NCOMPPROCS=2
+
 # WM_ARCH_OPTION = 32 | 64
 : ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION
 
@@ -128,8 +133,6 @@ Linux)
         case $WM_ARCH_OPTION in
         32)
             export WM_COMPILER_ARCH='-64'
-            export WM_CC='gcc'
-            export WM_CXX='g++'
             export WM_CFLAGS='-m32 -fPIC'
             export WM_CXXFLAGS='-m32 -fPIC'
             export WM_LDFLAGS='-m32'
@@ -137,8 +140,6 @@ Linux)
         64)
             WM_ARCH=linux64
             export WM_COMPILER_LIB_ARCH=64
-            export WM_CC='gcc'
-            export WM_CXX='g++'
             export WM_CFLAGS='-m64 -fPIC'
             export WM_CXXFLAGS='-m64 -fPIC'
             export WM_LDFLAGS='-m64'
@@ -157,8 +158,6 @@ Linux)
     mips64)
         WM_ARCH=SiCortex64
         export WM_COMPILER_LIB_ARCH=64
-        export WM_CC='gcc'
-        export WM_CXX='g++'
         export WM_CFLAGS='-mabi=64 -fPIC'
         export WM_CXXFLAGS='-mabi=64 -fPIC'
         export WM_LDFLAGS='-mabi=64 -G0'
@@ -168,8 +167,6 @@ Linux)
     ppc64)
         WM_ARCH=linuxPPC64
         export WM_COMPILER_LIB_ARCH=64
-        export WM_CC='gcc'
-        export WM_CXX='g++'
         export WM_CFLAGS='-m64 -fPIC'
         export WM_CXXFLAGS='-m64 -fPIC'
         export WM_LDFLAGS='-m64'
@@ -181,11 +178,24 @@ Linux)
     esac
     ;;
 
+Darwin)
+    case `uname -p` in
+    powerpc)
+	export WM_ARCH=darwinPpc
+	;;
+    i386)
+	export WM_ARCH=darwinIntel
+	;;
+    *)
+        echo "This seems to be an Intel-Mac please tell me the output of 'uname -p'. Bernhard."
+	export WM_ARCH=darwinIntel
+	;;
+    esac
+    ;;
+
 SunOS)
     WM_ARCH=SunOS64
     export WM_COMPILER_LIB_ARCH=64
-    export WM_CC='gcc'
-    export WM_CXX='g++'
     export WM_CFLAGS='-mabi=64 -fPIC'
     export WM_CXXFLAGS='-mabi=64 -fPIC'
     export WM_LDFLAGS='-mabi=64 -G0'
@@ -196,7 +206,7 @@ SunOS)
     cat <<USAGE
 
     Your "$WM_ARCH" operating system is not supported by this release
-    of OpenFOAM. For further assistance, please contact www.OpenFOAM.org
+    of OpenFOAM. For further assistance, please contact www.openfoam.org
 
 USAGE
     ;;