diff --git a/NEWS b/NEWS
index 69d9d1b1..e0c6d362 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@
 
 * Fixed #1887 - zmq_bind IPv4 fallback still tries IPv6
 
+* Fixed #98 - don't require libssp without libsodium on Solaris
+
 
 0MQ version 4.0.7 stable, released on 2015/06/15
 ================================================
diff --git a/configure.ac b/configure.ac
index 3d5f6d67..f412942d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,8 +158,6 @@ case "${host_os}" in
         if test "x$solaris_has_atomic" = "xno"; then
             AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
         fi
-        # ssp library is required for libsodium on Solaris-like systems
-        LDFLAGS="-lssp $LDFLAGS"
         CPPFLAGS="$CPPFLAGS -Wno-long-long"
         ;;
     *freebsd*)
@@ -259,7 +257,20 @@ AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([rt], [clock_gettime])
 
 if test "x$with_libsodium" != "xno"; then
-    AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security))
+    AC_SEARCH_LIBS([sodium_init], [sodium], [
+        case "${host_os}" in
+            *solaris*)
+                # ssp library is required for libsodium on Solaris-like systems
+                LDFLAGS="-lssp $LDFLAGS"
+                # Cannot compile with libsodium, pragma diagnostic causes warnings
+                libzmq_pedantic="no"
+                libzmq_werror="no"
+                ;;
+            *)
+                ;;
+        esac
+        AC_DEFINE(HAVE_LIBSODIUM, 1, [Have libsodium])
+        ], AC_MSG_WARN(libsodium is needed for CURVE security))
 else
     AC_MSG_WARN(libsodium is needed for CURVE security)
 fi
diff --git a/src/zmq.cpp b/src/zmq.cpp
index d73fc7b8..15bbf7c2 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -1053,4 +1053,4 @@ int zmq_device (int /* type */, void *frontend_, void *backend_)
         (zmq::socket_base_t*) backend_, NULL);
 }
 
-} //extern "C"
\ No newline at end of file
+} //extern "C"