diff --git a/bin/foamPack b/bin/foamPack
index 3f35f5b57d..02258a4ee4 100755
--- a/bin/foamPack
+++ b/bin/foamPack
@@ -89,7 +89,7 @@ find -H $packDir               \
  -e "\@$packDir/lib/@d"        \
  -e '\@/\.git/@d'              \
  -e '\@applications/bin/@d'    \
- -e '\@wmake/utilbin/@d'       \
+ -e '\@wmake/bin/@d'           \
  -e '\@/t/@d'                     \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'   \
  -e '\@doc/[Dd]oxygen/html@d'     \
diff --git a/bin/foamPackBin b/bin/foamPackBin
index 5a60b405a9..00d60ba5f0 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -76,7 +76,7 @@ dirList=$(
         $packDir/lib/$arch \
         $packDir/applications/bin/$arch \
         $packDir/wmake/rules \
-        $packDir/wmake/utilbin/$baseArch \
+        $packDir/wmake/bin/$baseArch \
         ;
     do
         [ -d $dir ] && echo $dir
diff --git a/bin/foamPackSource b/bin/foamPackSource
index b5e34c8a04..dbb1860bca 100755
--- a/bin/foamPackSource
+++ b/bin/foamPackSource
@@ -82,7 +82,7 @@ find -H $packDir               \
  -e '\@/\.git/@d'              \
  -e '\@/\.tags/@d'             \
  -e '\@applications/bin/@d'    \
- -e '\@wmake/utilbin/@d'       \
+ -e '\@wmake/bin/@d'           \
  -e '\@/t/@d'                  \
  -e '\@/Make[.A-Za-z]*/[^/]*/@d'\
  -e '\@/platforms/@d'          \
diff --git a/wmake/Makefile b/wmake/Makefile
index ae4fd43f13..28b7015b71 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -29,7 +29,9 @@
 #     Generic Makefile used by wmake
 #
 #------------------------------------------------------------------------------
-# Set shell the Makefile uses to the Bourne shell
+
+#------------------------------------------------------------------------------
+# The Makefile use a POSIX shell
 #------------------------------------------------------------------------------
 
 SHELL      = /bin/sh
diff --git a/wmake/makeWmake b/wmake/makeWmake
index 30a6565095..21386f41be 100755
--- a/wmake/makeWmake
+++ b/wmake/makeWmake
@@ -34,6 +34,6 @@
 # run from this directory only
 cd ${0%/*} || exit 1
 
-( cd src && make )
+( cd src && make $@ )
 
 #------------------------------------------------------------------------------
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index d764aeba88..a74c250f88 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -43,7 +43,22 @@ SHELL      = /bin/sh
 .SUFFIXES:
 .SUFFIXES: .o
 
-BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
+
+#------------------------------------------------------------------------------
+# set compilation and dependency building rules
+#------------------------------------------------------------------------------
+
+GENERAL_RULES = $(WM_DIR)/rules/General
+RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
+BIN           = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
+
+include $(RULES)/general
+include $(RULES)/$(WM_LINK_LANGUAGE)
+
+
+#------------------------------------------------------------------------------
+# targets
+#------------------------------------------------------------------------------
 
 all:  $(BIN)/dirToString $(BIN)/wmkdep
 
@@ -59,16 +74,7 @@ $(BIN)/wmkdep: wmkdep.l
 	@mkdir -p $(BIN)
 	flex wmkdep.l
 	$(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
+	@rm -f lex.yy.c 2>/dev/null
 
 
-#------------------------------------------------------------------------------
-# set compilation and dependency building rules
-#------------------------------------------------------------------------------
-
-GENERAL_RULES = $(WM_DIR)/rules/General
-RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-
-include $(RULES)/general
-include $(RULES)/$(WM_LINK_LANGUAGE)
-
 #------------------------------------------------------------------------------