diff --git a/Makefile b/Makefile
index d626790..323c39d 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/s
 	$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
 
 $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
-	$(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
+	$(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative
 
 ifndef USE_GIT
   $(SNAPPY_SRC): $(SNAPPY_UNPACKED)
diff --git a/Makefile.common b/Makefile.common
index 20ad780..35789e2 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -66,7 +66,7 @@ CROSS_PREFIX :=
 Default_CXX          := $(CROSS_PREFIX)g++
 Default_STRIP        := $(CROSS_PREFIX)strip
 Default_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
-Default_LINKFLAGS    := -shared -static
+Default_LINKFLAGS    := -shared -static -lcrypt
 Default_LIBNAME      := libsnappyjava.so
 Default_SNAPPY_FLAGS := 
 
diff --git a/src/main/java/org/xerial/snappy/OSInfo.java b/src/main/java/org/xerial/snappy/OSInfo.java
index 70d0f0e..a1884fa 100755
--- a/src/main/java/org/xerial/snappy/OSInfo.java
+++ b/src/main/java/org/xerial/snappy/OSInfo.java
@@ -140,7 +140,12 @@ public class OSInfo
         else if (osName.contains("Linux")) {
             return "Linux";
         }
-        else {
+       
+
+	else if ( osName.contains("AIX")) {
+	    return "AIX";
+	}
+	else {
             return osName.replaceAll("\\W", "");
         }
     }
diff --git a/src/main/resources/org/xerial/snappy/native/AIX/ppc64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/AIX/ppc64/libsnappyjava.so
index b5fc93c..87cc34b 100755
Binary files a/src/main/resources/org/xerial/snappy/native/AIX/ppc64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/AIX/ppc64/libsnappyjava.so differ