diff --git a/NT/Release/elconv.exe b/NT/Release/elconv.exe
index c485b6fa..4a69f657 100644
Binary files a/NT/Release/elconv.exe and b/NT/Release/elconv.exe differ
diff --git a/NT/Release/elog.exe b/NT/Release/elog.exe
index 61ab47ba..994d1be3 100644
Binary files a/NT/Release/elog.exe and b/NT/Release/elog.exe differ
diff --git a/NT/Release/elogd.exe b/NT/Release/elogd.exe
index 1b25bc7a..bda2dd07 100644
Binary files a/NT/Release/elogd.exe and b/NT/Release/elogd.exe differ
diff --git a/NT/elogd.vcxproj b/NT/elogd.vcxproj
index c25ac76b..9ed76692 100644
--- a/NT/elogd.vcxproj
+++ b/NT/elogd.vcxproj
@@ -105,7 +105,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wsock32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Debug/elogd.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/build.bat b/build.bat
index 1dc66595..25a896ef 100755
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ cl /O2 /Ob2 /Oi /Ot /I "\mxml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SEC
 cl /O2 /Ob2 /Oi /Ot /I "\mxml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_VC80_UPGRADE=0x0710" /D _USING_V110_SDK71_ /D "_MBCS" /GF /FD /EHsc /MT /Gy /Fo".\NT\Release/" /W3 /nologo /c /Zi /TC \mxml\mxml.c
 cl /O2 /Ob2 /Oi /Ot /I "\mxml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_VC80_UPGRADE=0x0710" /D _USING_V110_SDK71_ /D "_MBCS" /GF /FD /EHsc /MT /Gy /Fo".\NT\Release/" /W3 /nologo /c /Zi /TC \mxml\strlcpy.c
 
-link "/OUT:.\NT\Release/elogd.exe" /INCREMENTAL:NO /DEBUG /SUBSYSTEM:CONSOLE /STACK:4000000 /MACHINE:X86 wsock32.lib advapi32.lib ".\NT\Release\elogd.obj" ".\NT\Release\mxml.obj" ".\NT\Release\regex.obj" ".\NT\Release\crypt.obj" ".\NT\Release\auth.obj" ".\NT\Release\strlcpy.obj" "\openssl\lib\vc\ssleay32MD.lib" "\openssl\lib\vc\libeay32MD.lib"
+link "/OUT:.\NT\Release/elogd.exe" /INCREMENTAL:NO /DEBUG /SUBSYSTEM:CONSOLE /STACK:4000000 /MACHINE:X86 wsock32.lib advapi32.lib Shlwapi.lib ".\NT\Release\elogd.obj" ".\NT\Release\mxml.obj" ".\NT\Release\regex.obj" ".\NT\Release\crypt.obj" ".\NT\Release\auth.obj" ".\NT\Release\strlcpy.obj" "\openssl\lib\vc\ssleay32MD.lib" "\openssl\lib\vc\libeay32MD.lib"
 
 cl /O2 /Ob2 /Oi /Ot /I "\mxml" /I "\openssl\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_VC80_UPGRADE=0x0710" /D _USING_V110_SDK71_ /D "_MBCS" /D "HAVE_SSL" /GF /FD /EHsc /MT /Gy /Fo".\NT\Release/" /W3 /nologo /c /Zi /TC src\elog.c
 link "/OUT:.\NT\Release/elog.exe" /INCREMENTAL:NO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:X86 wsock32.lib ".\NT\Release\elog.obj" ".\NT\Release\crypt.obj" ".\NT\Release\strlcpy.obj" "\openssl\lib\vc\ssleay32MD.lib" "\openssl\lib\vc\libeay32MD.lib"
diff --git a/src/elogd.c b/src/elogd.c
index 64e1bf3c..c3636632 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -22303,7 +22303,7 @@ void format_email_html(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NA
    }
 
    max_att_size = max_attachment_size(lbs, message_id);
-   max_allowed_att_size = 10E6;
+   max_allowed_att_size = (int)10E6;
    if (getcfg(lbs->name, "Max email attachment size", str, sizeof(str)))
       max_allowed_att_size = atoi(str);
 
@@ -22584,7 +22584,7 @@ int compose_email(LOGBOOK * lbs, char *rcpt_to, char *mail_to, int message_id,
    if (getcfg(lbs->name, "Email encoding", str, sizeof(str)))
       mail_encoding = atoi(str);
 
-   max_allowed_att_size = 10E6;
+   max_allowed_att_size = (int)10E6;
    if (getcfg(lbs->name, "Max email attachment size", str, sizeof(str)))
       max_allowed_att_size = atoi(str);
 
diff --git a/src/elogd.h b/src/elogd.h
index 480473c8..8a51b1f2 100644
--- a/src/elogd.h
+++ b/src/elogd.h
@@ -67,6 +67,7 @@
 #define DIR_SEPARATOR_STR "\\"
 
 #define snprintf _snprintf
+#define strcasestr StrStrIA
 
 #include <windows.h>
 #include <io.h>
@@ -76,6 +77,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include <Shlwapi.h>
+
 #else
 
 #define OS_UNIX