diff --git a/CHANGES.txt b/CHANGES.txt
index 813d56165e..b48c233a70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -497,6 +497,9 @@ Trunk (unreleased changes)
     for testing.  (Kan Zhang via szetszwo)
 
     HADOOP-6182. Fix ReleaseAudit warnings (Giridharan Kesavan and Lee Tucker via gkesavan)
+
+    HADOOP-6173. Change src/native/packageNativeHadoop.sh to package all
+    native library files.  (Hong Tang via szetszwo)
  
   OPTIMIZATIONS
 
diff --git a/src/native/packageNativeHadoop.sh b/src/native/packageNativeHadoop.sh
index b4832c0ebf..4ce6f2e13b 100755
--- a/src/native/packageNativeHadoop.sh
+++ b/src/native/packageNativeHadoop.sh
@@ -42,7 +42,7 @@ then
     fi
     echo "Copying libraries in $BASE_NATIVE_LIB_DIR/$platform to $DIST_LIB_DIR/$platform/"
     cd $BASE_NATIVE_LIB_DIR/$platform/
-    $TAR *hadoop* | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
+    $TAR . | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
   done
 fi
 
@@ -58,7 +58,7 @@ then
     fi
     echo "Copying libraries in $BUILD_NATIVE_DIR/$platform/lib to $DIST_LIB_DIR/$platform/"
     cd $BUILD_NATIVE_DIR/$platform/lib
-    $TAR *hadoop* | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
+    $TAR . | (cd $DIST_LIB_DIR/$platform/; $UNTAR)
   done  
 fi