diff --git a/lib/common.sh b/lib/common.sh
index 6bbf6dee07b76e488a61090d101b14cc12e7c16c..5c144e26744596223d7b7a71ac4ed827a060719d 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -62,7 +62,7 @@ setup_workdir() {
 }
 
 cleanup() {
-	trap - EXIT INT QUIT TERM
+	trap - EXIT INT QUIT TERM HUP
 
 	[[ -n $WORKDIR ]] && rm -rf "$WORKDIR"
 	[[ $1 ]] && exit $1
diff --git a/mkarchroot.in b/mkarchroot.in
index c826b0a9f671ad8b35d8d522ccff3e562973e026..5bcde7629217c20dc331d311fd3b4fe3c1fea371 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -153,6 +153,7 @@ copy_hostconf () {
 }
 
 chroot_umount () {
+	trap - EXIT INT QUIT TERM HUP
 	umount "${working_dir}/proc/sys"
 	umount "${working_dir}/proc"
 	umount "${working_dir}/sys"