diff --git a/bin/findEmptyMake b/bin/findEmptyMake
new file mode 100755
index 0000000000..37125c97e7
--- /dev/null
+++ b/bin/findEmptyMake
@@ -0,0 +1,82 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     findEmptyMake
+#
+# Description
+#     Usage: findEmptyMake [dir1 .. dirN]
+#
+#     Find Make/ directories without a 'files' or 'options' file.
+#     This can occur when a directory has been moved.
+#------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: ${0##*/} [OPTION] [dir1 .. dirN]
+
+Find Make/ directories without a 'files' or 'options' file.
+This can occur when a directory has been moved.
+
+USAGE
+    exit 1
+}
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -*)
+       usage "unknown option: '$*'"
+       ;;
+    *)
+       break
+       ;;
+    esac
+done
+
+# default is the current directory
+[ "$#" -gt 0 ] || set -- .
+
+for checkDir
+do
+    if [ -d "$checkDir" ]
+    then
+        echo "searching: $checkDir" 1>&2
+    else
+        echo "skipping non-dir: $checkDir" 1>&2
+        continue
+    fi
+
+    find $checkDir -depth -name Make -type d -print | while read makeDir
+    do
+        [ -r "$makeDir/files" -a -r "$makeDir/options" ] || echo "$makeDir"
+    done
+
+done
+# -----------------------------------------------------------------------------
diff --git a/bin/finddep b/bin/finddep
index 331983cba1..0ef6401f4c 100755
--- a/bin/finddep
+++ b/bin/finddep
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -30,9 +30,9 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-
 Usage: ${0##*/} <file1> ... <fileN>
 
 * find all .dep files referring to any of <file1> ... <fileN>
diff --git a/bin/foamPackBin b/bin/foamPackBin
index 3ee4641383..1aee24cadf 100755
--- a/bin/foamPackBin
+++ b/bin/foamPackBin
@@ -46,7 +46,7 @@ case "${0##*/}" in
     ;;
 *)
     # regular
-    codeBase="OpenFOAM ThirdParty"
+    codeBase="OpenFOAM"
     packDir=$WM_PROJECT-$WM_PROJECT_VERSION
     listBinDirs=$toolsDir/foamListBinDirs
     ;;
diff --git a/bin/foamPackDeps b/bin/foamPackDeps
index 1de69167df..d0c6552122 100755
--- a/bin/foamPackDeps
+++ b/bin/foamPackDeps
@@ -45,7 +45,7 @@ case "${0##*/}" in
     ;;
 *)
     # regular
-    codeBase="OpenFOAM ThirdParty"
+    codeBase="OpenFOAM"
     packDir=$WM_PROJECT-$WM_PROJECT_VERSION
     ;;
 esac
diff --git a/bin/foamPackMake b/bin/foamPackMake
index f930e633c7..08d2b69504 100755
--- a/bin/foamPackMake
+++ b/bin/foamPackMake
@@ -45,7 +45,7 @@ case "${0##*/}" in
     ;;
 *)
     # regular
-    codeBase="OpenFOAM ThirdParty"
+    codeBase="OpenFOAM"
     packDir=$WM_PROJECT-$WM_PROJECT_VERSION
     ;;
 esac