diff --git a/vendorsetup.sh b/vendorsetup.sh
index 1d46f5d6e81cecf514223d9387b8cead1e96c0b9..6bdcaeeb2f2d31c968c81050869c8266389eb5f9 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -101,9 +101,9 @@ __patch_tree()
                fi
             fi
          }
-         apply() {
+         am() {
             if [[ -d .git ]]; then
-               git apply --index $1
+               git am $1
             else
                patch -p1 < $1
             fi
@@ -200,7 +200,7 @@ __patch_tree()
 
                      echo "  ${P}"
                      case $P in
-                     *.patch)  apply ${ROOT_DIR}/$P ; commit $P ;;
+                     *.patch)  am ${ROOT_DIR}/$P ;;
                      *.sh)     source ${ROOT_DIR}/$P ; commit $P ;;
                      *.sha1)   cherrypick ${ROOT_DIR}/$P ;;
                      esac