diff --git a/Makefile b/Makefile
index 807ef20..b67855a 100644
--- a/Makefile
+++ b/Makefile
@@ -81,3 +81,6 @@ mac32:
 
 linux32:
 	$(MAKE) native OS_NAME=Linux OS_ARCH=i386
+
+clean-native-linux32:
+	$(MAKE) clean-native OS_NAME=Linux OS_ARCH=i386
diff --git a/Makefile.common b/Makefile.common
index e3337c5..c851c2b 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -57,15 +57,15 @@ Default_SNAPPY_FLAGS :=
 
 Linux-i386_CXX       := g++
 Linux-i386_STRIP     := strip
-Linux-i386_CXXFLAGS  := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -m32
+Linux-i386_CXXFLAGS  := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32
 Linux-i386_LINKFLAGS := -shared -static-libgcc -static-libstdc++ 
 Linux-i386_LIBNAME   := libsnappyjava.so
 Linux-i386_SNAPPY_FLAGS:= 
 
 Linux-amd64_CXX       := g++ 
 Linux-amd64_STRIP     := strip
-Linux-amd64_CXXFLAGS  := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -m64
-Linux-amd64_LINKFLAGS :=  -shared -static-libgcc -static-libstdc++
+Linux-amd64_CXXFLAGS  := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden  -m64 
+Linux-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ 
 Linux-amd64_LIBNAME   := libsnappyjava.so
 Linux-amd64_SNAPPY_FLAGS  := 
 
diff --git a/lib/inc_linux/jni_md.h b/lib/inc_linux/jni_md.h
new file mode 100644
index 0000000..9b5d1a8
--- /dev/null
+++ b/lib/inc_linux/jni_md.h
@@ -0,0 +1,24 @@
+/*
+ * %W% %E%
+ *
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+
+#ifndef _JAVASOFT_JNI_MD_H_
+#define _JAVASOFT_JNI_MD_H_
+
+#define JNIEXPORT __attribute__((__visibility__("default")))
+#define JNIIMPORT
+#define JNICALL
+
+typedef int jint;
+#ifdef _LP64 /* 64-bit Solaris */
+typedef long jlong;
+#else
+typedef long long jlong;
+#endif
+
+typedef signed char jbyte;
+
+#endif /* !_JAVASOFT_JNI_MD_H_ */
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
index 34c0b34..eb81245 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so differ
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so
index 16d2736..ee6a964 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so differ