diff --git a/library/Makefile b/library/Makefile
index 6337313..7b932b3 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -1,6 +1,9 @@
 
 # Also see "include/polarssl/config.h"
 
+# To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your
+# environment
+#
 CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
 OFLAGS	= -O
 
@@ -26,6 +29,7 @@
 # Windows shared library extension:
 ifdef WINDOWS
 DLEXT=dll
+LDFLAGS += -lws2_32
 endif
 
 OBJS=	aes.o		arc4.o		asn1parse.o		\
@@ -75,5 +79,9 @@
 	$(CC) $(CFLAGS) $(OFLAGS) -c $<
 
 clean:
+ifndef WINDOWS
 	rm -f *.o libpolarssl.*
-
+endif
+ifdef WINDOWS
+	del /Q /F *.o libpolarssl.*
+endif
diff --git a/programs/Makefile b/programs/Makefile
index 3a4f729..2f486cd 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -1,6 +1,6 @@
 
 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
-# To compile on MinGW: add "-lws2_32" to LDFLAGS
+# To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your env
 # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
 
 CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement
@@ -185,5 +185,10 @@
 	$(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c    $(LDFLAGS) -o $@
 
 clean:
+ifndef WINDOWS
 	rm -f $(APPS)
+endif
+ifdef WINDOWS
+	del /S /Q /F *.o *.exe
+endif
 
diff --git a/tests/Makefile b/tests/Makefile
index f25607b..fd5d6a5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 
 # To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
-# To compile on MinGW: add "-lws2_32" to LDFLAGS
+# To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your env
 # To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
 
 CFLAGS	+= -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-statement \
@@ -168,9 +168,15 @@
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
 
 clean:
+ifndef WINDOWS
 	rm -f $(APPS) *.c
+endif
+ifdef WINDOWS
+	del /Q /F *.c *.exe
+endif
 
 check: $(APPS)
+ifndef WINDOWS
 	echo "Running checks (Success if all tests PASSED)"	
 	RETURN=0;																\
 	for i in $(APPS);														\
@@ -187,3 +193,4 @@
 		echo "";															\
 	done;																	\
 	if [ "$$RETURN" -eq 1 ]; then exit 1; fi
+endif