diff --git a/remote.c b/remote.c
index bb774d0bcc..a8196b1b5d 100644
--- a/remote.c
+++ b/remote.c
@@ -196,6 +196,11 @@ static int handle_config(const char *key, const char *value)
 			remote->receivepack = xstrdup(value);
 		else
 			error("more than one receivepack given, using the first");
+	} else if (!strcmp(subkey, ".uploadpack")) {
+		if (!remote->uploadpack)
+			remote->uploadpack = xstrdup(value);
+		else
+			error("more than one uploadpack given, using the first");
 	}
 	return 0;
 }
diff --git a/remote.h b/remote.h
index 17b8b5b5d5..72c9153783 100644
--- a/remote.h
+++ b/remote.h
@@ -16,6 +16,7 @@ struct remote {
 	int fetch_refspec_nr;
 
 	const char *receivepack;
+	const char *uploadpack;
 };
 
 struct remote *remote_get(const char *name);