diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index ad8f9a88d0..7ef46a7224 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -48,7 +48,7 @@ linux_trampoline.c: linux_trampoline.S
 	mv trampoline.c linux_trampoline.c
 	rm linux_trampoline trampoline
 
-.PHONY: install
+.PHONY: install distclean help
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
 	$(INSTALL) cbfstool $(DESTDIR)$(BINDIR)
@@ -58,6 +58,18 @@ install: all
 	$(INSTALL) ifittool $(DESTDIR)$(BINDIR)
 	$(INSTALL) cbfs-compression-tool $(DESTDIR)$(BINDIR)
 
+distclean: clean
+
+help:
+	@echo "cbfstool & associated tools"
+	@echo "Targets: all, clean, distclean, help"
+	@echo "  cbfstool - Manipulate CBFS images"
+	@echo "  fmaptool - Compile Flashmap descriptor (fmd) files"
+	@echo "  rmodtool - Create relocatable modules"
+	@echo "  ifwitool - Manipulate Intel FW Image (IFWI)"
+	@echo "  ifittool - Manipulate Intel FW Interface Table (FIT)"
+	@echo "  cbfs-compression-tool - benchmark compression algorithms"
+
 ifneq ($(V),1)
 .SILENT:
 endif
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 536aef5094..4ef224ce99 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -87,7 +87,7 @@ amdcompobj += elfheaders.o
 amdcompobj += common.o
 amdcompobj += xdr.o
 
-TOOLCFLAGS ?= -Werror -Wall -Wextra
+TOOLCFLAGS ?= -Werror -Wall -Wextra -Wshadow
 TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
 TOOLCFLAGS += -O2