diff --git a/Makefile b/Makefile
index 30667caf..32814478 100644
--- a/Makefile
+++ b/Makefile
@@ -51,20 +51,17 @@ solaris:
 #  o  Set VC variable below to where VS 6.0 is installed on your system
 #  o  Run "PATH_TO_VC6\bin\nmake windows"
 
-VC=	q:\vc6
+VC=	z:
 #DBG=	/Zi /DDEBUG /Od /DDEBUG
 DBG=	/DNDEBUG /Os
-CL=	$(VC)\bin\cl.exe  /MD /TC /nologo /W4 /c $(DBG) /I $(VC)/include
-LINK=	$(VC)\bin\link.exe /incremental:no /libpath:$(VC)\lib ws2_32.lib
-OUT=	c:\out
-DLL=	$(OUT)\_$(PROG).dll
-EXE=	$(OUT)\$(PROG).exe
+SSL=	y:\release\cyassl.lib crypt32.lib advapi32.lib
+CL=	cl /MD /TC /nologo $(DBG) /DNO_SSL_DL /I $(VC)\include
+LINK=	/link /incremental:no /libpath:$(VC)\lib ws2_32.lib $(SSL)
 
 windows:
-	$(CL) main.c /Fd$(OUT)\main.pdb /Fo$(OUT)\main.obj
-	$(CL) mongoose.c /Fd$(OUT)\mongoose.pdb /Fo$(OUT)\mongoose.obj
-	$(LINK) $(OUT)\mongoose.obj /DLL /DEF:win32\dll.def /out:$(DLL)
-	$(LINK) $(OUT)\main.obj $(OUT)\mongoose.obj /out:$(EXE)
+	$(CL) main.c mongoose.c $(LINK) /DLL /DEF:win32\dll.def \
+		/out:_$(PROG).dll
+	$(CL) main.c mongoose.c $(LINK) /out:$(PROG).exe
 
 # Build for Windows under MinGW
 #MINGWDBG= -DDEBUG -O0
diff --git a/win32/installer.nsi b/win32/installer.nsi
index 1923ff28..4070bd92 100644
--- a/win32/installer.nsi
+++ b/win32/installer.nsi
@@ -2,7 +2,7 @@
 !define MENUDIR "Mongoose web server"
 !define	SVC "Mongoose ${VERSION}"
 
-OutFile c:\mongoose-${VERSION}.install.exe
+OutFile mongoose-${VERSION}.install.exe
 Name "Mongoose ${VERSION}"
 InstallDir C:\mongoose-${VERSION}
 
@@ -25,8 +25,7 @@ Section "Mongoose files (required)"
 SectionEnd
 
 Section "SSL files"
-  File ssleay32.dll
-  File libeay32.dll
+  SectionIn RO
   File ssl_cert.pem
 
   # Following lines add full path to the certificate file in the mongoose.conf
diff --git a/win32/libeay32.dll b/win32/libeay32.dll
deleted file mode 100644
index f30465a0..00000000
Binary files a/win32/libeay32.dll and /dev/null differ
diff --git a/win32/mongoose.conf b/win32/mongoose.conf
index 10f33e4e..e846435a 100644
--- a/win32/mongoose.conf
+++ b/win32/mongoose.conf
@@ -5,7 +5,7 @@
 
 document_root c:\
 
-                                                                      
+# Placeholder for ssl_certificate                                                                                                                                                   
 
 listening_ports 80,443s
 access_log_file c:\mongoose_access_log.txt
diff --git a/win32/ssleay32.dll b/win32/ssleay32.dll
deleted file mode 100644
index 132bbfeb..00000000
Binary files a/win32/ssleay32.dll and /dev/null differ