diff --git a/Makefile b/Makefile
index 3ae3d3b..a4a5ec4 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.8c
+GIT_VERSION = 0.99.8d
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
diff --git a/connect.c b/connect.c
index c577f2e..e21d39a 100644
--- a/connect.c
+++ b/connect.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "pkt-line.h"
 #include "quote.h"
+#include "refs.h"
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/debian/changelog b/debian/changelog
index abd8ff4..42332b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.8d-0) unstable; urgency=low
+
+  * GIT 0.99.8d
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 15 Oct 2005 17:22:58 -0700
+
 git-core (0.99.8c-0) unstable; urgency=low
 
   * GIT 0.99.8c
diff --git a/git-clone.sh b/git-clone.sh
index 7143131..78c83e8 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -53,7 +53,11 @@
 	while read sha1 refname
 	do
 		name=`expr "$refname" : 'refs/\(.*\)'` &&
-		git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+		case "$name" in
+		*^{}) ;;
+		*)
+			git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1 ;;
+		esac
 	done <"$clone_tmp/refs"
 	rm -fr "$clone_tmp"
 }
diff --git a/git-fetch.sh b/git-fetch.sh
index d398866..8fb6fba 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -170,7 +170,11 @@
 reflist=$(get_remote_refs_for_fetch "$@")
 if test "$tags"
 then
-	taglist=$(git-ls-remote --tags "$remote" | awk '{ print "."$2":"$2 }')
+	taglist=$(git-ls-remote --tags "$remote" |
+		sed -e '
+			/\^{}$/d
+			s/^[^	]*	//
+			s/.*/&:&/')
 	if test "$#" -gt 1
 	then
 		# remote URL plus explicit refspecs; we need to merge them.