diff --git a/openup b/openup
index d22e6d4..b1ff00e 100755
--- a/openup
+++ b/openup
@@ -90,14 +90,15 @@ if [ -n "${_badrel}" ]; then
 fi
 
 _ARCH=$(arch -s)
-_TMPDIR="${TMPDIR:=/tmp}"
-_TMPKEY=$(mktemp -p ${_TMPDIR} .openup-pkg_key.XXXXXXXXXX) || exit 1
-_TMPSPLITCERT=$(mktemp -p ${_TMPDIR} .openup-split_cert.XXXXXXXXXX) || exit 1
-_TMPVUXML=$(mktemp -p ${_TMPDIR} .openup-vuxml.XXXXXXXXXX) || exit 1
+_TMP="${TMPDIR:=/tmp}"
+_TMPDIR=$(mktemp -dp ${_TMP} .openup-XXXXXXXXXX) || exit 1
+_TMPKEY="${_TMPDIR}/key"
+_TMPSPLITCERT="${_TMPDIR}/cert"
+_TMPVUXML="${_TMPDIR}/vuxml"
 
 export PKG_PATH=${PKG_PATH_UPDATE}:${PKG_PATH_MAIN}
 
-trap "rm -f ${_TMPDIR}/.openup-*" 1 2 3 13 15
+trap "rm -rf ${_TMPDIR}" 1 2 3 13 15
 
 pr_bigarrow() {
 	if [ -z "${checkmode}" ]; then
@@ -328,4 +329,4 @@ fi
 
 do_i_need_to_reboot
 
-rm -f ${_TMPDIR}/.openup-*
+rm -rf ${_TMPDIR}