diff --git a/Makefile b/Makefile
index 1552e0a..a783879 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all install clean distclean:
 PACKAGE=sysvinit
 VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog)
 GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g')
-override TMP:=$(shell mktemp -d $(VERSION).XXXXXXXX)
+override TMP:=$(shell mktemp -du $(VERSION).XXXXXXXX)
 override TARBALL:=$(TMP)/$(PACKAGE)-$(VERSION).tar.xz
 override SFTPBATCH:=$(TMP)/$(VERSION)-sftpbatch
 SOURCES=contrib  COPYING  COPYRIGHT  doc  Makefile  man  README  src
@@ -35,7 +35,7 @@ $(TARBALL): $(TMP)/$(PACKAGE)-$(VERSION)
 	@tar --exclude=.git --owner=nobody --group=nogroup -cf $@ -C $(TMP) $(PACKAGE)-$(VERSION)
 
 $(TMP)/$(PACKAGE)-$(VERSION):
-	@mkdir $(TMP)/$(PACKAGE)-$(VERSION)
+	@mkdir -p $(TMP)/$(PACKAGE)-$(VERSION)
 	@cp -R $(SOURCES) $(TMP)/$(PACKAGE)-$(VERSION)/ 
 	@chmod -R a+r,u+w,og-w $@
 	@find $@ -type d | xargs -r chmod a+rx,u+w,og-w
diff --git a/doc/Changelog b/doc/Changelog
index efcf0db..0cdeac0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -48,6 +48,8 @@ sysvinit (2.90) UNRELEASED; urgency=low
     * Updated version information in init.c
     * Updated compiler flag from -fstack-protector to -fstack-protector-strong
       for better protection.
+    * Cleaned up toplevel Makefile so it stops creating unnecessary temporary
+      directories.
 
 
 sysvinit (2.89) world; urgency=low
diff --git a/src/Makefile b/src/Makefile
index df0fe3e..34d74df 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,7 +9,7 @@
 #
 
 CPPFLAGS =
-CFLAGS	?= -ansi -O2 -fomit-frame-pointer -fstack-protector-strong 
+CFLAGS	?= -ansi -O2 -fomit-frame-pointer -fstack-protector-strong
 override CFLAGS += -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE 
 override CFLAGS += $(shell getconf LFS_CFLAGS)
 STATIC	=