diff --git a/Makefile b/Makefile
index 7de4bbe..199cc47 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@
 # Define USE_STDEV below if you want git to care about the underlying device
 # change being considered an inode change from the update-cache perspective.
 
-GIT_VERSION = 1.0.0a
+GIT_VERSION = 1.0.0b
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
diff --git a/debian/changelog b/debian/changelog
index adebba5..8dc86c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (1.0.0b-0) unstable; urgency=low
+
+  * GIT 1.0.0b to include two more fixes.
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 13:50:21 -0800
+
 git-core (1.0.0a-0) unstable; urgency=low
 
   * GIT 1.0.0a to include the following fixes:
diff --git a/quote.c b/quote.c
index 76eb144..7218a70 100644
--- a/quote.c
+++ b/quote.c
@@ -126,8 +126,10 @@
 
 	if (!no_dq)
 		EMIT('"');
-	for (sp = name; (ch = *sp++) && (sp - name) <= namelen; ) {
-
+	for (sp = name; sp < name + namelen; sp++) {
+		ch = *sp;
+		if (!ch)
+			break;
 		if ((ch < ' ') || (ch == '"') || (ch == '\\') ||
 		    (ch == 0177)) {
 			needquote = 1;
diff --git a/server-info.c b/server-info.c
index 6089765..05bce7d 100644
--- a/server-info.c
+++ b/server-info.c
@@ -99,7 +99,10 @@
 	while (fgets(line, sizeof(line), fp)) {
 		int len = strlen(line);
 		if (line[len-1] == '\n')
-			line[len-1] = 0;
+			line[--len] = 0;
+
+		if (!len)
+			continue;
 
 		switch (line[0]) {
 		case 'P': /* P name */