diff --git a/cat-file.c b/cat-file.c
index 6ff9d5576a4317020b5a42cb90846668a2a6ca40..be41f516664bc96ebec77c9ab88c3ab8df02ddfa 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 	unsigned long size;
 
 	if (argc != 3 || get_sha1(argv[2], sha1))
-		usage("cat-file [-t | tagname] <sha1>");
+		usage("git-cat-file [-t | tagname] <sha1>");
 
 	if (!strcmp("-t", argv[1])) {
 		buf = read_sha1_file(sha1, type, &size);
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
 	}
 
 	if (!buf)
-		die("cat-file %s: bad file", argv[2]);
+		die("git-cat-file %s: bad file", argv[2]);
 
 	while (size > 0) {
 		long ret = write(1, buf, size);
@@ -38,9 +38,9 @@ int main(int argc, char **argv)
 			/* Ignore epipe */
 			if (errno == EPIPE)
 				break;
-			die("cat-file: %s", strerror(errno));
+			die("git-cat-file: %s", strerror(errno));
 		} else if (!ret) {
-			die("cat-file: disk full?");
+			die("git-cat-file: disk full?");
 		}
 		size -= ret;
 		buf += ret;
diff --git a/export.c b/export.c
index 78bfe9f2224408056ad7992827dff498302e67b7..b6487177d3cad0de3a5a88b0bd0fd3c9cfc22948 100644
--- a/export.c
+++ b/export.c
@@ -12,7 +12,7 @@ void show_commit(struct commit *commit)
 	strcpy(hex, sha1_to_hex(commit->object.sha1));
 	printf("Id: %s\n", hex);
 	fflush(NULL);
-	sprintf(cmdline, "cat-file commit %s", hex);
+	sprintf(cmdline, "git-cat-file commit %s", hex);
 	system(cmdline);
 	if (commit->parents) {
 		char *against = sha1_to_hex(commit->parents->item->object.sha1);