diff --git a/make/dev-utils.mk b/make/dev-utils.mk
index c72f719b..9f74e197 100644
--- a/make/dev-utils.mk
+++ b/make/dev-utils.mk
@@ -1,10 +1,14 @@
 ifndef DEV_UTILS_MK_INCLUDED
 DEV_UTILS_MK_INCLUDED        = true
 
+PROCESS_TEXT_FILES_PY       := $(PYTHON) /opt/jw-python/bin/process-text-files.py
+
 MAKEFILE_INDENT_EQUAL_POS   ?= 30
 MAKEFILE_INDENT_NAME_REGEX  ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$)
 MAKEFILE_INDENT_ROOT        ?= .
 
+CLEANUP_SPACES_NAME_REGEX   ?= (\.mk$$|makefile$$|Makefile$$|GNUmakefile$$|\.cpp$$|\.c$$|\.h$$|\.conf$$|\.tmpl$$)
+
 all:
 install:
 clean distclean:
@@ -27,13 +31,23 @@ install-to-system:
 		sudo systemctl restart $$s ;\
 	done
 
+list-files echo-files:
+	@$(LIST_VCS_FILES) -f
+
+list-text-files echo-text-files:
+	@$(LIST_VCS_FILES) -ft
+
 indent-makefiles:
-	$(PYTHON) /opt/jw-python/bin/process-text-files.py \
-		indent-makefiles \
+	$(PROCESS_TEXT_FILES_PY) indent-makefiles \
 		--equal-pos $(MAKEFILE_INDENT_EQUAL_POS) \
 		--skip-short 6 \
 		--name-regex="$(MAKEFILE_INDENT_NAME_REGEX)" \
 		--root=$(MAKEFILE_INDENT_ROOT) \
-		--min-assignments=4
+		--min-assignments 4
+
+cleanup-spaces:
+	@$(PROCESS_TEXT_FILES_PY) cleanup-spaces \
+		--name-regex="$(CLEANUP_SPACES_NAME_REGEX)" \
+		--root=$(MAKEFILE_INDENT_ROOT)
 
 endif # ifndef DEV_UTILS_MK_INCLUDED