diff --git a/CHANGES.txt b/CHANGES.txt
index 396a0e0e692..5a6e1794454 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,9 @@
 Hbase Change Log
+  BUG FIXES
+   HBASE-574   HBase does not load hadoop native libs (Rong-En Fan via Stack)
+
+Release 0.1.1 04/11/2008
+
   INCOMPATIBLE CHANGES
    HBASE-521   Improve client scanner interface
    HBASE-577   NPE getting scanner
diff --git a/bin/hbase b/bin/hbase
index 044c0756049..f578af70bce 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -157,6 +157,23 @@ if $cygwin; then
   HBASE_HOME=`cygpath -d "$HBASE_HOME"`
   HBASE_LOG_DIR=`cygpath -d "$HBASE_LOG_DIR"`
 fi
+# setup 'java.library.path' for native-hadoop code if necessary
+JAVA_LIBRARY_PATH=''
+if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
+  JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+
+  if [ -d "$HBASE_HOME/build/native" ]; then
+    JAVA_LIBRARY_PATH=${HBASE_HOME}/build/native/${JAVA_PLATFORM}/lib
+  fi
+
+  if [ -d "${HBASE_HOME}/lib/native" ]; then
+    if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
+      JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:${HBASE_HOME}/lib/native/${JAVA_PLATFORM}
+    else
+      JAVA_LIBRARY_PATH=${HBASE_HOME}/lib/native/${JAVA_PLATFORM}
+    fi
+  fi
+fi
 
 # cygwin path translation
 if $cygwin; then
diff --git a/lib/native/Linux-amd64-64/libhadoop.a b/lib/native/Linux-amd64-64/libhadoop.a
new file mode 100644
index 00000000000..a1e1fce4d55
Binary files /dev/null and b/lib/native/Linux-amd64-64/libhadoop.a differ
diff --git a/lib/native/Linux-amd64-64/libhadoop.so b/lib/native/Linux-amd64-64/libhadoop.so
new file mode 100644
index 00000000000..b770c99ed89
Binary files /dev/null and b/lib/native/Linux-amd64-64/libhadoop.so differ
diff --git a/lib/native/Linux-amd64-64/libhadoop.so.1 b/lib/native/Linux-amd64-64/libhadoop.so.1
new file mode 100644
index 00000000000..b770c99ed89
Binary files /dev/null and b/lib/native/Linux-amd64-64/libhadoop.so.1 differ
diff --git a/lib/native/Linux-amd64-64/libhadoop.so.1.0.0 b/lib/native/Linux-amd64-64/libhadoop.so.1.0.0
new file mode 100644
index 00000000000..b770c99ed89
Binary files /dev/null and b/lib/native/Linux-amd64-64/libhadoop.so.1.0.0 differ
diff --git a/lib/native/Linux-i386-32/libhadoop.a b/lib/native/Linux-i386-32/libhadoop.a
new file mode 100644
index 00000000000..5dfb3f899fb
Binary files /dev/null and b/lib/native/Linux-i386-32/libhadoop.a differ
diff --git a/lib/native/Linux-i386-32/libhadoop.so b/lib/native/Linux-i386-32/libhadoop.so
new file mode 100644
index 00000000000..894079c638e
Binary files /dev/null and b/lib/native/Linux-i386-32/libhadoop.so differ
diff --git a/lib/native/Linux-i386-32/libhadoop.so.1 b/lib/native/Linux-i386-32/libhadoop.so.1
new file mode 100644
index 00000000000..894079c638e
Binary files /dev/null and b/lib/native/Linux-i386-32/libhadoop.so.1 differ
diff --git a/lib/native/Linux-i386-32/libhadoop.so.1.0.0 b/lib/native/Linux-i386-32/libhadoop.so.1.0.0
new file mode 100644
index 00000000000..894079c638e
Binary files /dev/null and b/lib/native/Linux-i386-32/libhadoop.so.1.0.0 differ