diff --git a/xbps-src/shutils/chroot.sh.in b/xbps-src/shutils/chroot.sh.in
index 77d3a7af47..84ca9bae62 100644
--- a/xbps-src/shutils/chroot.sh.in
+++ b/xbps-src/shutils/chroot.sh.in
@@ -77,6 +77,11 @@ if [ -n "$XBPS_COMPRESS_LEVEL" ]; then
 fi
 echo "# End of configuration file." >> $XBPSSRC_CF
 
+msg_normal "Cleaning up /tmp..."
+if [ -d $XBPS_MASTERDIR/tmp ]; then
+	rm -rf $XBPS_MASTERDIR/tmp/*
+fi
+
 prepare_chroot()
 {
 	local f=