diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
index 94041fd0..a8cc81c1 100644
--- a/src/tools/pkcs11-tool.c
+++ b/src/tools/pkcs11-tool.c
@@ -22,6 +22,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>
 #ifdef ENABLE_OPENSSL
 #include <openssl/opensslv.h>
@@ -374,6 +375,11 @@ int main(int argc, char * argv[])
 	int action_count = 0;
 	CK_RV rv;
 
+#ifdef _WIN32
+	if (_set_fmode(_O_BINARY) == EINVAL)
+		util_fatal("Cannot set FMODE to O_BINARY");
+#endif
+
 #ifdef ENABLE_OPENSSL
 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
 	OPENSSL_config(NULL);