diff --git a/mk/disk.mk b/mk/disk.mk
index d84d8069b..9f64a1789 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -5,8 +5,9 @@ ifeq ($(FSTOOLS_IN_PODMAN),1)
 	$(PODMAN_RUN) make $@
 else
 	mkdir -p $(BUILD)
-	rm -rf $@  $@.partial
+	-$(FUMOUNT) $(MOUNT_DIR) || true
 	-$(FUMOUNT) /tmp/redox_installer || true
+	rm -rf $@  $@.partial $(MOUNT_DIR)
 	FILESYSTEM_SIZE=$(FILESYSTEM_SIZE) && \
 	if [ -z "$$FILESYSTEM_SIZE" ] ; then \
 	FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \
@@ -65,7 +66,7 @@ else
 	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/harddrive.img $(MOUNT_DIR)
 	@sleep 2
-	@pgrep redoxfs
+	@echo "\033[1;36;49mharddrive.img mounted ($$(pgrep redoxfs))\033[0m"
 endif
 
 mount_extra: $(FSTOOLS) FORCE
@@ -75,7 +76,7 @@ else
 	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/extra.img $(MOUNT_DIR)
 	@sleep 2
-	@pgrep redoxfs
+	@echo "\033[1;36;49mextra.img mounted ($$(pgrep redoxfs))\033[0m"
 endif
 
 mount_live: $(FSTOOLS) FORCE
@@ -85,7 +86,7 @@ else
 	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/redox-live.iso $(MOUNT_DIR)
 	@sleep 2
-	@pgrep redoxfs
+	@echo "\033[1;36;49mredox-live.iso mounted ($$(pgrep redoxfs))\033[0m"
 endif
 
 unmount: FORCE
@@ -96,4 +97,5 @@ else
 	-$(FUMOUNT) $(MOUNT_DIR)
 	@rm -rf $(MOUNT_DIR)
 	@-$(FUMOUNT) /tmp/redox_installer 2>/dev/null || true
+	@echo "\033[1;36;49mFilesystem unmounted\033[0m"
 endif
diff --git a/mk/repo.mk b/mk/repo.mk
index fde29b408..646e9d9c9 100644
--- a/mk/repo.mk
+++ b/mk/repo.mk
@@ -96,8 +96,8 @@ else
 endif
 ifeq ($(ALLOW_FSTOOLS),1)
 	@if [ -f $(MOUNTED_TAG) ]; then \
-		$(MAKE) unmount && rm -f $(MOUNTED_TAG) && echo "Filesystem unmounted"; \
-	else echo "Not unmounting by ourself, don't forget to do it"; \
+		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
+	else echo "\033[0;33;49mNot unmounting by ourself, don't forget to do it\033[0m"; \
 	fi
 endif
 
@@ -121,8 +121,8 @@ else
 endif
 ifeq ($(ALLOW_FSTOOLS),1)
 	@if [ -f $(MOUNTED_TAG) ]; then \
-		$(MAKE) unmount && rm -f $(MOUNTED_TAG) && echo "Filesystem unmounted"; \
-	else echo "Not unmounting by ourself, don't forget to do it"; \
+		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
+	else echo "\033[1;33;49mNot unmounting by ourself, don't forget to do it\033[0m"; \
 	fi
 endif