diff --git a/make.sh b/make.sh
index d29eb15..810bca5 100755
--- a/make.sh
+++ b/make.sh
@@ -27,7 +27,7 @@ function _md5() {
 }
 
 # Set up a temp file.
-TEMPFILE=$(mktemp /tmp/${0##*/}.XXXX)
+TEMPFILE=$(mktemp /tmp/${0##*/}.XXXXXX)
 
 # Set up the release directory.  Copy things into the directory so
 # we can alter them without messing with stuff that is under source control.
diff --git a/util/generate-nagios-config b/util/generate-nagios-config
index 3845c46..9c9d07f 100755
--- a/util/generate-nagios-config
+++ b/util/generate-nagios-config
@@ -4,7 +4,7 @@ set -e
 set -u
 
 PRJ="Percona Monitoring Plugins"
-TEMP=$(mktemp "/tmp/${0##*/}-nagios-setup.XXXX")
+TEMP=$(mktemp "/tmp/${0##*/}-nagios-setup.XXXXXX")
 trap 'rm -rf "${TEMP}" >/dev/null 2>&1' EXIT
 read -e -p "Configuration file prefix to use [/etc/nagios/objects]: " DIR
 DIR="${DIR:-/etc/nagios/objects}"