diff --git a/Makefile b/Makefile
index ba8a5cc..da91d97 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@
 #
 #  Only used to build distribution tarballs.
 #
-TMP        ?= /tmp
-DIST_PREFIX = ${TMP}
+TMPDIR     ?= /tmp
+DIST_PREFIX = ${TMPDIR}
 VERSION     = 4.5
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
diff --git a/debian/changelog b/debian/changelog
index 046be06..c0a634d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
       author/release tests (xt).
     + Make test suite support as-installed-testing
       - Mark package as autopkgtestable.
+    + Multiple release workflow improvements (target release in Makefile):
+      - Use TMPDIR instead of TMP for temporary directories.
   * Update Vcs-* headers and documentation as Gitorious closed its doors
     in June 2015 and is now only available with static contents.
   * Recommend debian-archive-keyring (for installing Debian DomUs on