diff --git a/Makefile.nmake b/Makefile.nmake
index 425f1ec26..a0a11ebdb 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -3,3 +3,13 @@ all:
 	$(MAKE) /F Makefile.nmake
 	cd ../../src/or
 	$(MAKE) /F Makefile.nmake
+	cd ../../src/test
+	$(MAKE) /F Makefile.nmake
+
+clean:
+	cd src/common
+	$(MAKE) /F Makefile.nmake clean
+	cd ../../src/or
+	$(MAKE) /F Makefile.nmake clean
+	cd ../../src/test
+	$(MAKE) /F Makefile.nmake clean
diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index 55923d2eb..9672f4fe9 100644
--- a/src/common/Makefile.nmake
+++ b/src/common/Makefile.nmake
@@ -18,3 +18,6 @@ libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS)
 
 libor-event.lib:  $(LIBOR_EVENT_OBJECTS)
 	lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib
+
+clean:
+	del *.obj *.lib libor*.lib