diff --git a/tools/uart-flash-server/Makefile b/tools/uart-flash-server/Makefile
index 0fccf7d4..e744aab0 100644
--- a/tools/uart-flash-server/Makefile
+++ b/tools/uart-flash-server/Makefile
@@ -1,10 +1,21 @@
 CC=$(CROSS_COMPILE)gcc
 CFLAGS=-Wall -DWOLFSSL_DEBUG -DTFM_TIMING_RESISTANT -DWOLFBOOT_SIGN_ECC256 -DWOLFBOOT_HASH_SHA256 -g -ggdb -I../../include -I../../hal -Wextra
+Q?=@
+ifeq ($(V),1)
+   Q=
+endif
 
 EXE=ufserver
 
-$(EXE): $(EXE).o ../../src/libwolfboot.o
-	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+$(EXE): $(EXE).o libwolfboot.o
+	$(Q)$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+
+%.o: %.c
+	$(Q)$(CC) $(CFLAGS) -c -o $(@) $(^)
+
+libwolfboot.o: ../../src/libwolfboot.c
+	$(Q)$(CC) $(CFLAGS) -c -o $(@) $(^)
+
 
 clean:
-	rm -f *.o $(EXE) ../../src/libwolfboot.o
+	$(Q)rm -f *.o $(EXE)