diff --git a/Makefile b/Makefile
index 7d7d6c6..d8de08b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,29 @@
 .PHONY: clean lib client server passwd
 
+SUBDIRS = hkexpasswd hkexsh hkexshd
+
 all: lib client server passwd
 
 clean:
-	rm -f\
- hkexsh/hkexsh hkexsh/hkexsh.exe\
- hkexshd/hkexshd hkexshd/hkexshd.exe\
- hkexpasswd/hkexpasswd hkexpasswd/hkexpasswd.exe
-
+	go clean .
+	for d in $(SUBDIRS); do\
+	  $(MAKE) -C $$d clean;\
+	done
 
 lib:
 	go install .
 
 client: lib
-	@cd hkexsh
-	go build .
-	@cd -
+	$(MAKE) -C hkexsh
 
 ifneq ($(MSYSTEM),)
 server: lib
-	@echo "hkexshd server not supported on Windows (yet)"
+	echo "hkexshd server not supported on Windows (yet)"
 else
 server: lib
-	@cd hkexshd
-	go build .
-	@cd -
+	$(MAKE) -C hkexshd
 endif
 
 passwd: lib
-	@cd hkexpasswd
-	@go build .
-	@cd -
+	$(MAKE) -C hkexpasswd