diff --git a/etc/bashrc b/etc/bashrc
index 5aae670e8..93f3a03b4 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -160,10 +160,11 @@ done
 : ${WM_OSTYPE:=POSIX}; export WM_OSTYPE
 
 
-# Compiler: set to Gcc or Icc (for Intel's icc)
+# Compiler: set to Gcc, Icc (for Intel's icc) or Clang
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : ${WM_COMPILER:=Gcc}; export WM_COMPILER
 #: ${WM_COMPILER:=Icc}; export WM_COMPILER
+#: ${WM_COMPILER:=Clang}; export WM_COMPILER
 
 export WM_COMPILER_ARCH=
 export WM_COMPILER_LIB_ARCH=
@@ -366,7 +367,7 @@ Darwin)
         echo "Using Macports binaries"
     fi
 
-    export WM_USE_MACPORT=1
+    export WM_USE_MACPORT=0
     export WM_BASE_COMPILER=`echo $WM_COMPILER | tr -d "[:digit:]"`
     export WM_MACPORT_MPI_VERSION=`echo $WM_COMPILER | tr "[:upper:]" "[:lower:]"`
     export WM_MACPORT_VERSION=`echo $WM_MACPORT_MPI_VERSION | tr -d "[:alpha:]" | sed -e "s/\(.\)\(.\)/\1\.\2/"`
@@ -435,8 +436,14 @@ Darwin)
             export WM_FC="gfortran-mp-$WM_MACPORT_VERSION"
         elif [ "$WM_BASE_COMPILER" == "Clang" ]
         then
-            export WM_CC="clang-mp-$WM_MACPORT_VERSION"
-            export WM_CXX="clang++-mp-$WM_MACPORT_VERSION"
+            if [ "$WM_USE_MACPORT" == "1" ]
+            then
+                export WM_CC="clang-mp-$WM_MACPORT_VERSION"
+                export WM_CXX="clang++-mp-$WM_MACPORT_VERSION"
+            else
+                export WM_CC="clang"
+                export WM_CXX="clang++"
+            fi
         # Seems like there is no Fortran-frontend for LLVM at thistime
         elif [ "$WM_BASE_COMPILER" == "Dragonegg" ]
         then