diff --git a/binsrc/virtuoso/viunix.c b/binsrc/virtuoso/viunix.c
index ee18a83af9..2593f81fd6 100644
--- a/binsrc/virtuoso/viunix.c
+++ b/binsrc/virtuoso/viunix.c
@@ -308,7 +308,10 @@ sigh_set_notifiers ()
 	  i != SIGTERM &&
 	  i != SIGHUP  &&
 	  i != SIGQUIT &&
-	  i != SIGPIPE)
+	  i != SIGPIPE &&
+          i != SIGSEGV) /* if we handle SIGSEGV, then crash backtrace
+                           will point to us instead of to the real
+                           crash place */
 	{
 	  if (SIG_ERR == signal (i, sigh_report_and_forget))
 	    {
diff --git a/libsrc/Dk/Dktypes.h b/libsrc/Dk/Dktypes.h
index cefcfb5590..3c36143ce2 100644
--- a/libsrc/Dk/Dktypes.h
+++ b/libsrc/Dk/Dktypes.h
@@ -190,7 +190,7 @@ typedef long long 		int64;
 #endif
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) || (defined(SOLARIS) && defined(__GNUC__))
 #define INFINITY (DBL_MAX+DBL_MAX)
 #define NAN (INFINITY-INFINITY)
 #endif