diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 5ceaa964b5..fc249c57f3 100644
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -103,7 +103,6 @@ extern unsigned long OPENSSL_ia32cap_P;
 void OPENSSL_showfatal(const char *,...);
 void *OPENSSL_stderr(void);
 extern int OPENSSL_NONPIC_relocated;
-int OPENSSL_isservice(void);
 
 #ifdef  __cplusplus
 }
diff --git a/crypto/crypto.h b/crypto/crypto.h
index ff09bc5fb4..776b434e16 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -545,6 +545,9 @@ void OpenSSLDie(const char *file,int line,const char *assertion);
 
 unsigned long *OPENSSL_ia32cap_loc(void);
 #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
+#ifdef OPENSSL_SYS_WIN32
+int OPENSSL_isservice(void);
+#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index c8bed170b5..8ad47fdab4 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -499,6 +499,8 @@ int ssl3_accept(SSL *s)
 			num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
 			if (num1 == 0)
 				num1=BIO_ctrl(s->wbio,BIO_CTRL_WPENDING,0,NULL);
+			if (num1 == 0)
+				num1=BIO_ctrl(s->wbio,BIO_CTRL_PENDING,0,NULL);
 			if (num1 > 0)
 				{
 				s->rwstate=SSL_WRITING;
diff --git a/util/libeay.num b/util/libeay.num
index 5b42c7fca3..071cc749ef 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3658,7 +3658,7 @@ ENGINE_get_ssl_client_cert_function     4045	EXIST:!VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_fn           4045	EXIST:VMS:FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046	EXIST::FUNCTION:ENGINE
 ENGINE_load_capi                        4047	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
-OPENSSL_isservice                       4048	NOEXIST::FUNCTION:
+OPENSSL_isservice                       4048	EXIST:WIN32:FUNCTION:
 FIPS_dsa_sig_decode                     4049	NOEXIST::FUNCTION:
 EVP_CIPHER_CTX_clear_flags              4050	NOEXIST::FUNCTION:
 FIPS_rand_status                        4051	NOEXIST::FUNCTION: