diff --git a/bin/pt-pmp b/bin/pt-pmp
index cbf536ae..e04827c0 100755
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -4,6 +4,48 @@
 # See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
 # notices and disclaimers.
 
+# ###########################################################################
+# tmpdir package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/tmpdir.sh
+#   t/lib/bash/tmpdir.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+set -u
+
+TMPDIR=""
+
+mk_tmpdir() {
+   local dir="${1:-""}"
+
+   if [ -n "$dir" ]; then
+      if [ ! -d "$dir" ]; then
+         mkdir "$dir" || die "Cannot make tmpdir $dir"
+      fi
+      TMPDIR="$dir"
+   else
+      local tool="${0##*/}"
+      local pid="$$"
+      TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
+         || die "Cannot make secure tmpdir"
+   fi
+}
+
+rm_tmpdir() {
+   if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
+      rm -rf "$TMPDIR"
+   fi
+   TMPDIR=""
+}
+
+# ###########################################################################
+# End tmpdir package
+# ###########################################################################
+
+set +u
+
 usage() {
    if [ "${OPT_ERR}" ]; then
       echo "${OPT_ERR}" >&2
@@ -100,7 +142,6 @@ aggregate_stacktrace() {
 
 # The main program to run.
 main() {
-   rm -f /tmp/percona-toolkit
 
    # Get command-line options
    for o; do
@@ -155,15 +196,14 @@ main() {
       fi
       date;
       for x in $(seq 1 $OPT_i); do
-         gdb -ex "set pagination 0" -ex "thread apply all bt" -batch -p $OPT_p >> "${OPT_k:-/tmp/percona-toolkit}"
-         date +'TS %N.%s %F %T' >> "${OPT_k:-/tmp/percona-toolkit}"
+         gdb -ex "set pagination 0" -ex "thread apply all bt" -batch -p $OPT_p >> "${OPT_k:-$TMPDIR/percona-toolkit}"
+         date +'TS %N.%s %F %T' >> "${OPT_k:-$TMPDIR/percona-toolkit}"
          sleep $OPT_s
       done
    fi
 
    if [ $# -eq 0 ]; then
-      aggregate_stacktrace "${OPT_l}" "${OPT_k:-/tmp/percona-toolkit}"
-      rm -f /tmp/percona-toolkit
+      aggregate_stacktrace "${OPT_l}" "${OPT_k:-$TMPDIR/percona-toolkit}"
    else
       aggregate_stacktrace "${OPT_l}" "$@"
    fi
@@ -172,7 +212,9 @@ main() {
 # Execute the program if it was not included from another file.  This makes it
 # possible to include without executing, and thus test.
 if [ "$(basename "$0")" = "pt-pmp" ] || [ "$(basename "$0")" = "bash" -a "$_" = "$0" ]; then
-    main "$@"
+   mk_tmpdir
+   main "$@"
+   rm_tmpdir
 fi
 
 # ############################################################################
diff --git a/util/update-modules b/util/update-modules
index 0407ba30..578d0f12 100755
--- a/util/update-modules
+++ b/util/update-modules
@@ -16,6 +16,7 @@ warn() {
    exit_status=$((exit_status | 1))
 }
 
+cwd="$PWD"
 if [ -n "$PERCONA_TOOLKIT_BRANCH" ]; then
    BRANCH=$PERCONA_TOOLKIT_BRANCH
 else
@@ -27,6 +28,7 @@ else
    fi
    BRANCH=`pwd`
 fi
+cd "$cwd"
 
 # ############################################################################
 # Global variables