diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index e904e3d..2188e2e 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -232,7 +232,7 @@ reportExecutable()
         echo "`fixlen "$1" 9`" "*** not installed ***"
         VERSION=""
         case "$1" in
-        gcc | $foamTestApp)
+        gcc* | $foamTestApp)
             echo "          CRITICAL ERROR"
             criticalError=`expr $criticalError + 1`
             ;;
@@ -249,10 +249,19 @@ reportExecutable()
         VERSION=`$1 --version /dev/null 2>&1      \
             | sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p' `
         ;;
-    gcc)
+    gcc* | g++*)
         VERSION=`$1 -v 2>&1 \
             | sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p' `
 
+        case "$1" in
+        gcc*)
+            BINARYCODENAME=gcc
+            ;;
+        g++*)
+            BINARYCODENAME=g++
+            ;;
+        esac
+
         MINV1=`echo $MIN_VERSION_GCC | cut -d. -f1`
         MINV2=`echo $MIN_VERSION_GCC | cut -d. -f2`
         MINV3=`echo $MIN_VERSION_GCC | cut -d. -f3`
@@ -285,14 +294,13 @@ reportExecutable()
         fi
 
         if [ "$gccOk" != "" ]; then
-            echo "ERROR: gcc version is too old for this release of OpenFOAM"
+            echo "ERROR: $BINARYCODENAME version is too old for this release of OpenFOAM"
             echo "    User version    : $VERSION"
             echo "    Minimum required: $MIN_VERSION_GCC"
             echo ""
             fatalError=`expr $fatalError + 1`
         fi
 
-
         ;;
     gtar)
         VERSION=`$APP_PATH --version | head -1`
@@ -458,6 +466,7 @@ echo "$COL1 $COL2 $COL3"
 hline
 reportExecutable flex
 reportExecutable "$WM_CC"
+reportExecutable "$WM_CXX"
 reportExecutable gzip
 if [ "$OSTYPE" = Linux ]
 then