diff --git a/bin/epm-pack b/bin/epm-pack
index 454bd6008cb015e92fea3e1a4cbe08df356f3d58..bfeed271c10a1b803ed95d82edd15e34cc452643 100644
--- a/bin/epm-pack
+++ b/bin/epm-pack
@@ -23,6 +23,21 @@ load_helper epm-assure
 [ -n "$EPM_PACK_SCRIPTS_DIR" ] || EPM_PACK_SCRIPTS_DIR="$CONFIGDIR/pack.d"
 
 
+__epm_remove_tmp_files()
+{
+    # TODO: move it to exit handler
+    if [ -z "$DEBUG" ] ; then
+        # TODO: reinvent
+        [ -n "$to_remove_pkg_files" ] && rm -f $to_remove_pkg_files
+        # hack??
+        [ -n "$to_remove_pkg_files" ] && rmdir $(dirname $to_remove_pkg_files | head -n1) 2>/dev/null
+        [ -n "$to_remove_pkg_dirs" ] && rmdir $to_remove_pkg_dirs 2>/dev/null
+        [ -n "$to_clean_tmp_dirs" ] && rm -rf $to_clean_tmp_dirs 2>/dev/null
+    fi
+    return 0
+}
+
+
 __epm_pack()
 {
 	local packname="$1"