diff --git a/GNUmakefile b/GNUmakefile
index a7800ce..87205a5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -13,7 +13,7 @@ USE_SSL       ?= NO
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES
-LDLIBS        += -lev
+LDLIBS        += -levent
 TERSE         ?= NO
 STACK_PROTECT ?= NO
 
@@ -21,6 +21,9 @@ ifeq ($(OS), Windows_NT)
 WINDOWS       ?= YES
 endif
 
+ifeq (SOLARIS,YES)
+LDLIBS        += -lsocket -lnsl
+endif
 
 CFLAGS        += -I./src/
 
diff --git a/src/uhub.h b/src/uhub.h
index e9a9062..d5288ff 100644
--- a/src/uhub.h
+++ b/src/uhub.h
@@ -80,7 +80,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifndef WIN32
+#if !defined(WIN32)
 #include <grp.h>
 #include <pwd.h>
 #include <sys/resource.h>
@@ -100,7 +100,7 @@
 
 #include <event.h>
 
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun__)
 #undef HAVE_STRNDUP
 #undef HAVE_MEMMEM
 #endif
@@ -115,7 +115,6 @@
 #endif
 #endif
 
-
 #define SERVER_PORT      1511
 #define SERVER_ADDR_IPV6 "::"
 #define SERVER_ADDR_IPV4 "0.0.0.0"