diff --git a/util/bucts/Makefile b/util/bucts/Makefile
index 3bc73ee3d6..98f731449e 100644
--- a/util/bucts/Makefile
+++ b/util/bucts/Makefile
@@ -1,21 +1,32 @@
 CC:=gcc
 OBJ:=bucts.o
+TARGET=bucts
 VERSION:=$(shell git describe)
-CFLAGS+=-Wall
+WERROR=-Werror
+CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR}
 
 ifeq ($(shell uname), FreeBSD)
 	CFLAGS += -I/usr/local/include
 	LDFLAGS += -L/usr/local/lib
 endif
 
-all: bucts
+all: $(TARGET)
 
-bucts: $(OBJ)
+$(TARGET): $(OBJ)
 	$(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci
 
 %.o: %.c
 	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $<
 
-.PHONY: clean
 clean:
 	rm -f bucts $(OBJ)
+
+distclean: clean
+
+help:
+	@echo "${TARGET}: tool to manipulate the BUC.TS bit on Intel targets."
+	@echo "Targets: all, clean, distclean, help"
+	@echo "To disable warnings as errors, run make as:"
+	@echo "  make all WERROR=\"\""
+
+.PHONY: all clean distclean help