diff --git a/git-remote.perl b/git-remote.perl
index c56c5a8..670bafb 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -67,7 +67,7 @@
 		$git->command(qw(config --get-regexp), '^remote\.');
 	};
 	for (@remotes) {
-		if (/^remote\.([^.]*)\.(\S*)\s+(.*)$/) {
+		if (/^remote\.(\S+?)\.([^.\s]+)\s+(.*)$/) {
 			add_remote_config(\%seen, $1, $2, $3);
 		}
 	}