diff --git a/git-fetch-script b/git-fetch-script
index 7cd88b93b21c47018be7de84e7b1252d32c6098f..2e62f001b189249243ad27b88bf8357526095f14 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -35,7 +35,7 @@ download_objects () {
 }
 
 echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD || exit 1
+download_one "$merge_repo/$merge_name" "$GIT_DIR"/FETCH_HEAD || exit 1
 
 echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" || exit 1
+download_objects "$merge_repo" "$(cat "$GIT_DIR"/FETCH_HEAD)" || exit 1
diff --git a/git-pull-script b/git-pull-script
index dbef56c70b7e40c69517c3ede33544d0e9efcc8a..90ee0f322d8c569a5b02b3be1548eb990b4263c9 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -17,5 +17,5 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1
 
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
-	"$(cat "$GIT_DIR"/MERGE_HEAD)" \
+	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
 	"$merge_name"
diff --git a/git-resolve-script b/git-resolve-script
index 91b001b9a9afbcadcbacf886dd11821c2aeee1b2..bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -12,7 +12,7 @@ merge_repo="$3"
 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
 dropheads() {
-	rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" \
+	rm -f -- "$GIT_DIR/MERGE_HEAD" \
 		"$GIT_DIR/LAST_MERGE" || exit 1
 }
 
@@ -44,7 +44,7 @@ if [ "$common" == "$head" ]; then
 	echo "Updating from $head to $merge."
 	git-read-tree -u -m $head $merge || exit 1
 	echo $merge > "$GIT_DIR"/HEAD
-	git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
+	git-diff-tree -p $head $merge | git-apply --stat
 	dropheads
 	exit 0
 fi