diff --git a/gen_funcs.sh b/gen_funcs.sh
index 21d35f3..dcc48bf 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -225,6 +225,9 @@ gen_die() {
 	print_info 1 'Please do *not* report compilation failures as genkernel bugs!'
 	print_info 1 ''
   	exit 1
+
+	# Cleanup temp dirs and caches if requested
+	cleanup
 }
 
 has_loop() {
diff --git a/genkernel b/genkernel
index 9c15c16..8f42f50 100755
--- a/genkernel
+++ b/genkernel
@@ -29,7 +29,6 @@ TEMP=${TEMP}/$RANDOM.$RANDOM.$RANDOM.$$
 
 cleanup(){
     if [ -n "$TEMP" -a -d "$TEMP" ]; then
-	echo "Removing $TEMP"
 	rm -rf "$TEMP"
     fi