diff --git a/archive/uppsrc/Web/SSL/SSL.upp b/archive/uppsrc/Web/SSL/SSL.upp
index a66b0bf66..ab8ac6555 100644
--- a/archive/uppsrc/Web/SSL/SSL.upp
+++ b/archive/uppsrc/Web/SSL/SSL.upp
@@ -16,7 +16,7 @@ library(WIN32 !NOSSL SHARED DEBUG) "libeay32MDd ssleay32MDd";
 
 library(WIN32) gdi32;
 
-library(LINUX !NOSSL) "crypto ssl";
+library(LINUX !NOSSL) "ssl crypto";
 
 link(WIN32 DEBUG MSC SO) /nodefaultlib:libc;
 
diff --git a/upp_cmake b/upp_cmake
index a403d7b64..92e3bd1f6 160000
--- a/upp_cmake
+++ b/upp_cmake
@@ -1 +1 @@
-Subproject commit a403d7b64575ec10c17f166c1654559d38eed290
+Subproject commit 92e3bd1f6e7e7bba3c6df8718d9395a4d8f99104
diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index f65d4307a..d1ea94107 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -11,6 +11,8 @@ library(BSD !OSX !OPENBSD) "pthread rt execinfo";
 
 library(SOLARIS) "posix4 dl";
 
+library(SUNOS) "socket";
+
 library(!WIN32 & !NOSO) z;
 
 library(OSX) pthread;
diff --git a/uppsrc/Core/SSH/SSH.upp b/uppsrc/Core/SSH/SSH.upp
index a9c328441..f99bc0355 100644
--- a/uppsrc/Core/SSH/SSH.upp
+++ b/uppsrc/Core/SSH/SSH.upp
@@ -11,7 +11,7 @@ uses
 
 uses(WIN32 | NOSO) plugin/z;
 
-library(POSIX) "crypto ssl z";
+library(POSIX) "ssl crypto z";
 
 library(WIN32) "ssl crypto";
 
diff --git a/uppsrc/Core/config.h b/uppsrc/Core/config.h
index 905fdb5ce..e0c0e2bc5 100644
--- a/uppsrc/Core/config.h
+++ b/uppsrc/Core/config.h
@@ -68,14 +68,18 @@
 				#if __DragonFly__
 					#define PLATFORM_DRAGONFLY 1
 				#endif
-			#elif __sun
-				#define PLATFORM_SOLARIS 1
+			#elif sun || __sun
+				#if __SVR4 || __svr4__
+					#define PLATFORM_SOLARIS 1
+				#else
+					#define PLATFORM_SUNOS 1
+				#endif
 			#else
 				#error Unknown OS
 			#endif
 		#endif
 	#endif
-	
+
 	#if  __x86_64
 		#define CPU_LE 1
 		#define CPU_LITTLE_ENDIAN 1
diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
index e32aa4cbe..c4c87a09d 100644
--- a/uppsrc/CtrlCore/CtrlCore.upp
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -12,9 +12,9 @@ library(WIN32) "user32 gdi32";
 
 link(OSX !X11) "-framework Foundation -framework Cocoa -framework Carbon";
 
-pkg_config(LINUX | FREEBSD | OPENBSD) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext";
+pkg_config(LINUX | FREEBSD | OPENBSD | SUNOS) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext";
 
-pkg_config((LINUX | FREEBSD | OPENBSD) !X11) "gtk+-3.0 libnotify";
+pkg_config((LINUX | FREEBSD | OPENBSD | SUNOS) !X11) "gtk+-3.0 libnotify";
 
 file
 	Core readonly separator,
diff --git a/uppsrc/CtrlLib/CtrlLib.upp b/uppsrc/CtrlLib/CtrlLib.upp
index a975272a8..f69eea608 100644
--- a/uppsrc/CtrlLib/CtrlLib.upp
+++ b/uppsrc/CtrlLib/CtrlLib.upp
@@ -6,7 +6,7 @@ acceptflags
 uses
 	CtrlCore;
 
-uses(POSIX | LINUX | FREEBSD | OPENBSD) PdfDraw;
+uses(POSIX | LINUX | FREEBSD | OPENBSD | SUNOS) PdfDraw;
 
 file
 	CtrlLib.h options(BUILDER_OPTION) PCH,
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index 922c69610..9b0ced05a 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -10,7 +10,7 @@ uses
 
 library(WIN32) "user32 gdi32";
 
-pkg_config(LINUX | FREEBSD | OPENBSD) "freetype2 x11 fontconfig xcb expat";
+pkg_config(LINUX | FREEBSD | OPENBSD | SUNOS) "freetype2 x11 fontconfig xcb expat";
 
 file
 	Draw.h options(BUILDER_OPTION) PCH,
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index ca3b51610..bdf4d7f74 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -367,6 +367,11 @@ void LocalHost::AddFlags(Index<String>& cfg)
 #ifdef PLATFORM_OSX11
 	cfg.Add("OSX11");
 #endif
+
+#ifdef PLATFORM_SUNOS
+	cfg.Add("SUNOS");
+#endif
+
 }
 
 const Vector<String>& LocalHost::GetExecutablesDirs() const
@@ -379,7 +384,8 @@ bool LocalHost::HasPlatformFlag(const Index<String>& cfg)
 	static const Index<String> platformFlags = {
 		"WIN32", "POSIX", "LINUX", "ANDROID",
 		"BSD", "FREEBSD", "OPENBSD", "NETBSD",
-		"DRAGONFLY", "SOLARIS", "OSX11", "OSX"
+		"DRAGONFLY", "SOLARIS", "OSX11", "OSX",
+		"SUNOS"
 	};
 
 	for(const String& flag : cfg)
diff --git a/uppsrc/plugin/ndisasm/lib/nasmlib.c b/uppsrc/plugin/ndisasm/lib/nasmlib.c
index b040ef125..5e2dd9c63 100644
--- a/uppsrc/plugin/ndisasm/lib/nasmlib.c
+++ b/uppsrc/plugin/ndisasm/lib/nasmlib.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
diff --git a/uppsrc/plugin/ndisasm/lib/snprintf.c b/uppsrc/plugin/ndisasm/lib/snprintf.c
index 0936411d9..71eb3f1d7 100644
--- a/uppsrc/plugin/ndisasm/lib/snprintf.c
+++ b/uppsrc/plugin/ndisasm/lib/snprintf.c
@@ -7,7 +7,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 
 #include "nasmlib.h"
@@ -34,4 +33,4 @@ int snprintf(char *str, size_t size, const char *format, ...)
 }
 
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/uppsrc/plugin/ndisasm/lib/sync.c b/uppsrc/plugin/ndisasm/lib/sync.c
index bfd1bbfb8..37593d6db 100644
--- a/uppsrc/plugin/ndisasm/lib/sync.c
+++ b/uppsrc/plugin/ndisasm/lib/sync.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <limits.h>
 
 #include "inttypes.h"
diff --git a/uppsrc/plugin/png/png.upp b/uppsrc/plugin/png/png.upp
index a168e3452..e71397cf1 100644
--- a/uppsrc/plugin/png/png.upp
+++ b/uppsrc/plugin/png/png.upp
@@ -54,7 +54,7 @@ options
 	-DPNG_NO_READ_OPT_PLTE,
 	-DPNG_NO_INFO_IMAGE;
 
-pkg_config(LINUX | FREEBSD | OPENBSD) libpng;
+pkg_config(LINUX | FREEBSD | OPENBSD | SUNOS) libpng;
 
 file
 	png.h,