diff --git a/README.txt b/README.txt
index c0a150b8f5..5578ad4459 100644
--- a/README.txt
+++ b/README.txt
@@ -200,7 +200,9 @@ Using MSYS
     endif
 
   This will force the directory copies to work in a way that can be handled
-  by the NuttX build system.
+  by the NuttX build system.  NOTE:  The default link.sh script has been
+  updated so that is should now be MSYS2 compatible.  The above is preferred
+  but no longer necessary in the Make.defs file.
 
   To build the simulator under MSYS, you also need:
 
diff --git a/tools/link.sh b/tools/link.sh
index f14e9e5abb..1c343c94ca 100755
--- a/tools/link.sh
+++ b/tools/link.sh
@@ -94,3 +94,18 @@ fi
 
 ln -s "${src}" "${dest}" || \
 	{ echo "Failed to create link: $dest" ; exit 1 ; }
+
+# Verify that the link was created
+
+if [ ! -h ${dest} ]; then
+	# The MSYS 'ln' command actually does a directory copy
+
+	if [ -d ${dest} ]; then
+		# Create the .fakelnk for unlink.sh
+		touch ${dest}/.fakelnk
+	else
+		echo "Error:  link at ${dest} not created."
+		exit 1
+	if
+fi
+