diff --git a/kiss b/kiss
index 4a76161..9132c47 100755
--- a/kiss
+++ b/kiss
@@ -616,7 +616,7 @@ pkg_build() {
 
         # Delete the log file if the build succeeded to prevent
         # the directory from filling very quickly with useless logs.
-        [ "$KISS_DEBUG" = 1 ] || rm -f "$log_dir/$pkg-$time-$pid"
+        [ "$KISS_KEEPLOG" = 1 ] || rm -f "$log_dir/$pkg-$time-$pid"
 
         # Copy the repository files to the package directory.
         # This acts as the database entry.
@@ -1164,6 +1164,7 @@ pkg_updates() {
 pkg_clean() {
     # Clean up on exit or error. This removes everything related
     # to the build.
+    [ "$KISS_DEBUG" != 1 ] || return
 
     # Block 'Ctrl+C' while cache is being cleaned.
     trap '' INT
diff --git a/kiss.1 b/kiss.1
index 164ac3d..8c17310 100644
--- a/kiss.1
+++ b/kiss.1
@@ -103,6 +103,12 @@ export KISS_ROOT=/
 # ones. Helpful when debugging.
 #
 # Set it to '1' to enable.
+export KISS_KEEPLOG=0
+
+# Keep build, package and extraction cache directories for debugging
+# purposes.
+#
+# Set it to '1' to enable.
 export KISS_DEBUG=0
 
 # Force the usage of a different 'sudo' tool.