diff --git a/ChangeLog b/ChangeLog
index 43b8612..82f2310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,9 +24,6 @@
      "minimize" others (eg use stddef.h if only size_t is needed).
    * Change #include lines in test files to use double quotes instead of angle
      brackets for uniformity with the rest of the code.
-   * Building with 'make' on windows now requires Unix utilities in the PATH
-     as well as a Unix shell. This enables more features such as the 'check'
-     target.
    * Remove dependency on sscanf() in X.509 parsing modules.
 
 = mbed TLS 1.3.10 released 2015-02-09
diff --git a/README.rst b/README.rst
index 5275e1b..004f094 100644
--- a/README.rst
+++ b/README.rst
@@ -35,12 +35,6 @@
 
     make check
 
-If you're building on windows using mingw, msys, or some similar environment, you should define the WINDOWS variable (and possibly the CC variable too), eg::
-
-    make CC=gcc WINDOWS=1
-
-You need to make sure the usual Unix utilities such as `ln` and `rm` are in your PATH and that make has access to a Unix shell.
-
 Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the mbed TLS Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue.
 
 In case you find that you need to do something else as well, please let us know what, so we can add it to the KB.
diff --git a/library/Makefile b/library/Makefile
index 9a4c3fd..d92d803 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -80,7 +80,11 @@
 
 libpolarssl.a: libmbedtls.a
 	echo "  LN    $@ -> $?"
+ifndef WINDOWS
 	ln -sf $? $@
+else
+	copy /y /b $? $@
+endif
 
 libmbedtls.a: $(OBJS)
 	echo "  AR    $@"
@@ -90,7 +94,11 @@
 
 libpolarssl.so: libmbedtls.so
 	echo "  LN    $@ -> $?"
+ifndef WINDOWS
 	ln -sf $? $@
+else
+	copy /y /b $? $@
+endif
 
 libmbedtls.${DLEXT}: $(OBJS)
 	echo "  LD    $@"
@@ -113,4 +121,9 @@
 	$(CC) $(CFLAGS) $(OFLAGS) -c $<
 
 clean:
+ifndef WINDOWS
 	rm -f *.o libpolarssl.* libmbedtls.*
+endif
+ifdef WINDOWS
+	del /Q /F *.o libpolarssl.* libmbedtls.*
+endif
diff --git a/programs/Makefile b/programs/Makefile
index 802e73c..ba8dd31 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -242,7 +242,12 @@
 	$(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
 
 list:
 	echo $(APPS)
diff --git a/tests/Makefile b/tests/Makefile
index b64eaff..6489e52 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -402,9 +402,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);														\
@@ -421,3 +427,4 @@
 		echo "";															\
 	done;																	\
 	if [ "$$RETURN" -eq 1 ]; then exit 1; fi
+endif