diff --git a/core/c/jbigi/build-all.sh b/core/c/jbigi/build-all.sh
index 861a1e0a4..d5dc7d4c5 100755
--- a/core/c/jbigi/build-all.sh
+++ b/core/c/jbigi/build-all.sh
@@ -3,6 +3,8 @@
 case `uname -sr` in
 MINGW*)
 	echo "Building windows .dlls for all architectures";;
+SunOS*) 
+	echo "Building solaris .sos for all architectures";;
 Linux*)
 	echo "Building linux .sos for all architectures";;
 FreeBSD*)
@@ -32,6 +34,8 @@ do
 	case `uname -sr` in
 	MINGW*)
 		cp jbigi.dll ../../lib/net/i2p/util/jbigi-windows-$x.dll;;
+	SunOS*)
+		cp libjbigi.so ../../lib/net/i2p/util/libjbigi-solaris-$x.so;;
 	Linux*)
 		cp libjbigi.so ../../lib/net/i2p/util/libjbigi-linux-$x.so;;
 	FreeBSD*)
diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
index 48562012a..de567bb5a 100755
--- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh
@@ -24,6 +24,11 @@ Darwin*)
         INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include"
         LINKFLAGS="-dynamiclib -framework JavaVM"
         LIBFILE="libjbigi.jnilib";;
+SunOS*)
+        COMPILEFLAGS="-fPIC -Wall"
+        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
+        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
+        LIBFILE="libjbigi.so";;
 *)
 	COMPILEFLAGS="-fPIC -Wall"
 	INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"