Index: win/makefile.vc
===================================================================
--- win/makefile.vc	(revision 61405)
+++ win/makefile.vc	(working copy)
@@ -435,11 +435,6 @@
 guilflags = $(lflags) -subsystem:windows
 
 baselibs  = kernel32.lib advapi32.lib user32.lib
-# Avoid 'unresolved external symbol __security_cookie' errors.
-# c.f. http://support.microsoft.com/?id=894573
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-baselibs   = $(baselibs) bufferoverflowU.lib
-!endif
 guilibs	  = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
 
 
Index: win/nmakehlp.c
===================================================================
--- win/nmakehlp.c	(revision 61405)
+++ win/nmakehlp.c	(working copy)
@@ -20,7 +20,7 @@
 #pragma comment (lib, "kernel32.lib")
 #include <stdio.h>
 #include <math.h>
-#if defined(_M_IA64) || defined(_M_AMD64)
+#if _MSC_FULL_VER > 140000000 && _MSC_FULL_VER <= 140040310
 #pragma comment(lib, "bufferoverflowU")
 #endif