diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index f43c2b1a30..cb2c43e843 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -6,17 +6,17 @@ wmake libso dummy
 
 case "$WM_MPLIB" in
 GAMMA)
-   wmake libso gamma
-   ;;
+    wmake libso gamma
+    ;;
 
 LAM | *MPI* )
-   export WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-   set +x
-   echo
-   echo "Note: ignore spurious warnings about missing mpicxx.h headers"
-   set -x
-   wmake libso mpi
-   ;;
+    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
+    set +x
+    echo
+    echo "Note: ignore spurious warnings about missing mpicxx.h headers"
+    set -x
+    wmake libso mpi
+    ;;
 esac
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/wmake/wmake b/wmake/wmake
index 61307c1180..911e7fbc30 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -163,8 +163,9 @@ then
         exit $?
     elif [ ! -d $MakeDir ]
     then
-        $make -k -f $WM_DIR/MakefileApps \
-            FOAM_APPS="`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name "Optional" -a ! -name "Make" \)  -printf "%f "`"
+        #FOAM_APPS=`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name "Optional" -a ! -name "Make" \)  -printf "%f "`
+        FOAM_APPS=`for d in *; do if [ -d "$d" -a "$d" != "Optional" -a "$d" != "Make" ]; then echo "$d"; fi; done | xargs`
+        $make -k -f $WM_DIR/MakefileApps FOAM_APPS="$FOAM_APPS"
         exit $?
     fi