diff -pruN pkgutils-5.40.1.orig/pkgmk.conf pkgutils-5.40.1/pkgmk.conf
--- pkgutils-5.40.1.orig/pkgmk.conf	2017-03-04 04:13:53.989655410 +0200
+++ pkgutils-5.40.1/pkgmk.conf	2017-03-04 05:03:32.923883369 +0200
@@ -36,5 +36,5 @@ esac
 # PKGMK_WGET_OPTS=""
 # PKGMK_CURL_OPTS=""
 # PKGMK_COMPRESSION_MODE="gz"
-
+# PKGMK_KEEP_WORK="no"
 # End of file
diff -pruN pkgutils-5.40.1.orig/pkgmk.conf.5.in pkgutils-5.40.1/pkgmk.conf.5.in
--- pkgutils-5.40.1.orig/pkgmk.conf.5.in	2017-03-04 04:13:53.989655410 +0200
+++ pkgutils-5.40.1/pkgmk.conf.5.in	2017-03-04 04:17:53.255270602 +0200
@@ -39,6 +39,14 @@ Set directory for built packages.
 .br
 Default: directory of Pkgfile.
 .TP
+\fBPKGMK_KEEP_WORK='STRING'\fP
+Keep work directory. Valid options are: 'yes', 'no' and 'failed'.
+.br
+If set to 'failed', it will be kept only if the build fails.
+.br
+Default: 'no'
+.br
+.TP
 \fBPKGMK_WORK_DIR='STRING'\fP
 Set directory for building packages.
 .br
Binary files pkgutils-5.40.1.orig/.pkgmk.conf.un~ and pkgutils-5.40.1/.pkgmk.conf.un~ differ
diff -pruN pkgutils-5.40.1.orig/pkgmk.in pkgutils-5.40.1/pkgmk.in
--- pkgutils-5.40.1.orig/pkgmk.in	2017-03-04 04:13:53.989655410 +0200
+++ pkgutils-5.40.1/pkgmk.in	2017-03-04 06:26:54.029639897 +0200
@@ -563,7 +563,7 @@ build_package() {
 		fi
 	fi
 
-	if [ "$PKGMK_KEEP_WORK" = "no" ]; then
+	if [ "$PKGMK_KEEP_WORK" = "no" ] || [ "$PKGMK_KEEP_WORK" = "failed" -a "$BUILD_SUCCESSFUL" = "yes" ]; then
 		remove_work_dir
 	fi
 
Binary files pkgutils-5.40.1.orig/.pkgmk.in.un~ and pkgutils-5.40.1/.pkgmk.in.un~ differ