diff --git a/crypto_sign/dilithium-iii/clean/GNUmakefile b/crypto_sign/dilithium-iii/clean/GNUmakefile
new file mode 100644
index 00000000..ca7d6810
--- /dev/null
+++ b/crypto_sign/dilithium-iii/clean/GNUmakefile
@@ -0,0 +1,15 @@
+LIB=libdilithium-iii_clean.a
+
+SOURCES=$(wildcard *.c)
+OBJECTS=$(patsubst %.c,%.o,$(SOURCES))
+
+CFLAGS=-Wall -Wextra -Wpedantic -Werror -std=c99 -I../../../common $(EXTRAFLAGS)
+
+all: $(LIB)
+
+$(LIB): $(OBJECTS)
+	$(AR) -r $@ $(OBJECTS)
+
+clean:
+	$(RM) $(OBJECTS)
+	$(RM) $(LIB)
diff --git a/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake
new file mode 100644
index 00000000..6a631ae4
--- /dev/null
+++ b/crypto_sign/dilithium-iii/clean/Makefile.Microsoft_nmake
@@ -0,0 +1,14 @@
+LIB=libdilithium-iii_clean.lib
+
+OBJECTS=ntt.c packing.c poly.c polyvec.c reduce.c rounding.c sign.c
+
+CFLAGS=/I ..\..\..\common /W1 /WX
+
+all: $(LIB)
+
+$(LIB): $(OBJECTS)
+	LIB.EXE /OUT:$@ $**
+
+clean:
+	DEL $(OBJECTS)
+	DEL $(LIB)
diff --git a/scripts_windows/build_all.bat b/scripts_windows/build_all.bat
index 44cec721..19c4ff87 100644
--- a/scripts_windows/build_all.bat
+++ b/scripts_windows/build_all.bat
@@ -5,14 +5,16 @@ SET EL=0
 REM CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 REM IF ERRORLEVEL 1 SET EL=1
 
-FOR /D %%K IN (crypto_kem\*) DO (
-  FOR /D %%L IN (%%K\*) DO (
-    cd %%L
-    nmake /f Makefile.Microsoft_nmake clean
-    IF ERRORLEVEL 1 SET EL=2
-    nmake /f Makefile.Microsoft_nmake
-    IF ERRORLEVEL 1 SET EL=3
-    cd ..\..\..
+FOR /D %%J IN (crypto_kem, crypto_sig) DO (
+  FOR /D %%K IN (%%J\*) DO (
+    FOR /D %%L IN (%%K\*) DO (
+      cd %%L
+      nmake /f Makefile.Microsoft_nmake clean
+      IF ERRORLEVEL 1 SET EL=2
+      nmake /f Makefile.Microsoft_nmake
+      IF ERRORLEVEL 1 SET EL=3
+      cd ..\..\..
+    )
   )
 )