diff --git a/win32/Makefile.Watcom b/win32/Makefile.Watcom
index fa328b80..1e8cede6 100644
--- a/win32/Makefile.Watcom
+++ b/win32/Makefile.Watcom
@@ -73,13 +73,15 @@ OPENSSL_ROOT = $(%openssl_root)
 OPENSSL_ROOT = ..\..\openssl-0.9.8zc
 !endif
 
-#!ifdef %use_zlib
-CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
-#!endif
+!ifdef %use_zlib
+CFLAGS += -DLIBSSH2_HAVE_ZLIB -I$(ZLIB_ROOT)
+!endif
 
-#!ifdef %use_ssl
-CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I$(OPENSSL_ROOT)\inc32
-#!endif
+!ifdef %use_wincng
+CFLAGS += -DLIBSSH2_WINCNG
+!else
+CFLAGS += -wcd=138 -dLIBSSH2_OPENSSL -I$(OPENSSL_ROOT)\inc32
+!endif
 
 !ifdef %use_watt32
 CFLAGS += -dUSE_WATT32 -I$(%watt_root)\inc
@@ -93,9 +95,11 @@ LIB_ARG  = $(OBJ_BASE)\stat\wlib.arg
 !ifndef %MAKEFLAGS
 !error You MUST call wmake with the -u switch!
 !else
-# only OpenSSL is supported with this build system
-CFLAGS += -dLIBSSH2_OPENSSL
+!ifdef %use_wincng
+!include ..\Makefile.WinCNG.inc
+!else
 !include ..\Makefile.OpenSSL.inc
+!endif
 !include ..\Makefile.inc
 !endif
 
@@ -168,12 +172,16 @@ $(LINK_ARG): $(__MAKEFILES__)
 !else
 	@%append $^@ library ws2_32.lib
 !endif
-#!ifdef %use_zlib
-	@%append $^@ library $(ZLIB_ROOT)\zlib.lib
-#!endif
-#!ifdef %use_ssl
-	@%append $^@ library $(OPENSSL_ROOT)\out32\libeay32.lib, $(OPENSSL_ROOT)\out32\ssleay32.lib
-#!endif
+!ifdef %use_zlib
+	@%append $^@ library '$(ZLIB_ROOT)\zlib.lib'
+!endif
+!ifdef %use_wincng
+	@%append $^@ library bcrypt.lib
+	@%append $^@ library crypt32.lib
+!else
+	@%append $^@ library '$(OPENSSL_ROOT)\out32\libeay32.lib'
+	@%append $^@ library '$(OPENSSL_ROOT)\out32\ssleay32.lib'
+!endif
 
 $(LIB_ARG): $(__MAKEFILES__)
 	%create $^@