diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index e61ee92ebe..137be213a1 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -28,6 +28,7 @@ CFGSET=true
 !MESSAGE                                  http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
 !MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes
 !MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes
+!MESSAGE   ENABLE_SPNEGO=<yes or no>    - Enable Simple and Protected GSSAPI Negotiation Mechanism, defaults to yes
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)
 !MESSAGE   DEBUG=<yes or no>            - Debug builds
@@ -77,6 +78,14 @@ USE_SSPI = true
 USE_SSPI = false
 !ENDIF
 
+!IFNDEF ENABLE_SPNEGO
+USE_SPNEGO = true
+!ELSEIF "$(ENABLE_SPNEGO)"=="yes"
+USE_SPNEGO = true
+!ELSEIF "$(ENABLE_SPNEGO)"=="no"
+USE_SPNEGO = false
+!ENDIF
+
 !IFNDEF ENABLE_WINSSL
 USE_WINSSL = $(USE_SSPI)
 !ELSEIF "$(ENABLE_WINSSL)"=="yes"
@@ -143,6 +152,10 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
 !ENDIF
 
+!IF "$(USE_SPNEGO)"=="true"
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego
+!ENDIF
+
 !IF "$(USE_WINSSL)"=="true"
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
 !ENDIF
@@ -166,6 +179,7 @@ $(MODE):
 	@SET USE_IDN=$(USE_IDN)
 	@SET USE_IPV6=$(USE_IPV6)
 	@SET USE_SSPI=$(USE_SSPI)
+	@SET USE_SPNEGO=$(USE_SPNEGO)
 	@SET USE_WINSSL=$(USE_WINSSL)
 	@$(MAKE) /NOLOGO /F MakefileBuild.vc
 
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 218b7c9c6c..de23e1a084 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -177,6 +177,17 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
 !ENDIF
 
 
+!IFNDEF USE_SPNEGO
+USE_SPNEGO  = true
+!ELSEIF "$(USE_SPNEGO)"=="yes"
+USE_SPNEGO  = true
+!ENDIF
+
+!IF "$(USE_SPNEGO)"=="true"
+SPNEGO_CFLAGS = $(SPNEGO_CFLAGS) /DHAVE_SPNEGO
+!ENDIF
+
+
 !IFNDEF USE_WINSSL
 !IF "$(USE_SSL)"=="true"
 USE_WINSSL  = false
@@ -314,6 +325,11 @@ CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
 !ENDIF
 
+!IF "$(USE_SPNEGO)"=="true"
+CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego
+!ENDIF
+
 !IF "$(USE_WINSSL)"=="true"
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
 !ENDIF
@@ -375,6 +391,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
 	@echo Using IDN:  $(USE_IDN)
 	@echo Using IPv6: $(USE_IPV6)
 	@echo Using SSPI: $(USE_SSPI)
+	@echo Using SPNEGO: $(USE_SPNEGO)
 	@echo Using WinSSL: $(USE_WINSSL)
 	@echo CFLAGS:     $(CFLAGS)
 	@echo LFLAGS:     $(LFLAGS)