diff --git a/bazaar/AESStream/AESStream.cpp b/bazaar/AESStream/AESStream.cpp
index 6fabc95f0..1ae0ae65b 100644
--- a/bazaar/AESStream/AESStream.cpp
+++ b/bazaar/AESStream/AESStream.cpp
@@ -1,4 +1,6 @@
 #include <Core/Core.h>
+
+#undef _WIN32
 #include <openssl/rand.h>
 #include "AESStream.h"
 
@@ -58,10 +60,10 @@ void AESInit()
 	if (aesInitDone)
 		return;
 	aesInitDone = true;
-	
+	 
 	if (RAND_status())
 		return;
-	
+	 
 	qword qw = (((qword) GetTickCount()) << 16) ^ ((qword) (GetSysTime().Get())) ^ Random();
 	RAND_seed(&qw, sizeof(qw));
 	
@@ -283,4 +285,4 @@ String AESDecoderStream::GetDecryptedData() throw (const char *)
 }
 
 //----------------------------------------------------------------------------------------------
-const dword AES_CONTAINER_DWORD_HEADER = 0x377FEA9F;
\ No newline at end of file
+const dword AES_CONTAINER_DWORD_HEADER = 0x377FEA9F;
diff --git a/bazaar/AESStream/AESStream.upp b/bazaar/AESStream/AESStream.upp
index 1a1f437cc..c750d88d7 100644
--- a/bazaar/AESStream/AESStream.upp
+++ b/bazaar/AESStream/AESStream.upp
@@ -1,11 +1,11 @@
 uses
 	Core;
 
-library(MSC) out32\libeay32.lib;
+library(MSC) "out32\\libeay32.lib gdi32.lib";
 
-library(MSC WIN32) gdi32.lib;
+library(WIN32 !MSC) out32dll\libeay32.lib;
 
-library(WIN32 !MSC) out32dll/libeay32.lib;
+library(!WIN32) ssl;
 
 include
 	plugin\openssl\inc32;
diff --git a/bazaar/AESStream/plugin/openssl/inc32/openssl/rand.h b/bazaar/AESStream/plugin/openssl/inc32/openssl/rand.h
index ea89153cb..7e553b35c 100644
--- a/bazaar/AESStream/plugin/openssl/inc32/openssl/rand.h
+++ b/bazaar/AESStream/plugin/openssl/inc32/openssl/rand.h
@@ -63,6 +63,17 @@
 #include <openssl/ossl_typ.h>
 #include <openssl/e_os2.h>
 
+// Added to improve Upp supported systems detection
+#ifdef PLATFORM_WIN32
+	#undef OPENSSL_SYS_UNIX
+	#define OPENSSL_SYS_WINDOWS
+	#define OPENSSL_SYS_WIN32
+#else
+	#define OPENSSL_SYS_UNIX
+	#undef OPENSSL_SYS_WINDOWS
+	#undef OPENSSL_SYS_WIN32
+#endif
+
 #if defined(OPENSSL_SYS_WINDOWS)
 #include <windows.h>
 #endif
diff --git a/bazaar/AESStream/src.tpp/Installing_OpenSSL$en-us.tpp b/bazaar/AESStream/src.tpp/Installing_OpenSSL$en-us.tpp
index 63ffe3b0d..080248667 100644
--- a/bazaar/AESStream/src.tpp/Installing_OpenSSL$en-us.tpp
+++ b/bazaar/AESStream/src.tpp/Installing_OpenSSL$en-us.tpp
@@ -24,7 +24,7 @@ topic "Installing OpenSSL";
 [{_}%EN-US 
 [s2; Installing OpenSSL&]
 [s5; [* 1. In Linux]&]
-[s5; Just install libopenssl using your package manager.&]
+[s5; Just install libssl using your package manager.&]
 [s5;* &]
 [s5; [* 2. In Windows]&]
 [s5; These steps are valid for revision 0.9.8l. In other versions 
@@ -74,4 +74,4 @@ Files`\Microsoft Visual Studio 9.0`\VC`\vcvarsall.bat`"`" x86]&]
 [s5; [* Last steps]&]
 [s5; 2.6. Add in `"Setup/Build methods/Lib directories`" menu, the 
 directory where out32 and out32dll have been copied.&]
-[s5; ]
\ No newline at end of file
+[s0; ]
\ No newline at end of file