diff --git a/Makefile b/Makefile
index 11173c0..04feafb 100644
--- a/Makefile
+++ b/Makefile
@@ -88,16 +88,16 @@ win32:
 
 # for cross-compilation on Ubuntu, install the g++-mingw-w64-x86-64 package
 win64:
-	$(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=amd64
+	$(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=x86_64
 
 mac32: 
-	$(MAKE) native OS_NAME=Mac OS_ARCH=i386
+	$(MAKE) native OS_NAME=Mac OS_ARCH=x86
 
 linux32:
-	$(MAKE) native OS_NAME=Linux OS_ARCH=i386
+	$(MAKE) native OS_NAME=Linux OS_ARCH=x86
 
 freebsd64:
-	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64
+	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64
 
 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
 linux-arm:
@@ -108,7 +108,7 @@ linux-armhf:
 	$(MAKE) native CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf
 
 clean-native-linux32:
-	$(MAKE) clean-native OS_NAME=Linux OS_ARCH=i386
+	$(MAKE) clean-native OS_NAME=Linux OS_ARCH=x86
 
 clean-native-win32:
 	$(MAKE) clean-native OS_NAME=Windows OS_ARCH=x86
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so
index 3299072..0aa1d90 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so differ
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/armhf/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/armhf/libsnappyjava.so
index 23b37c6..1bf749c 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/armhf/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/armhf/libsnappyjava.so differ
diff --git a/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so
index 0085465..4534c13 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so differ
diff --git a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll
index 5fc4252..5317765 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll and b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll differ
diff --git a/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll b/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll
index a54064f..b367f2a 100755
Binary files a/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll and b/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll differ