diff --git a/git-commit.sh b/git-commit.sh
index 82d743bd03..193feeb5e4 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -165,6 +165,7 @@ then
 	then
 		pick_author_script='
 		/^author /{
+			s/'\''/'\''\\'\'\''/g
 			h
 			s/^author \([^<]*\) <[^>]*> .*$/\1/
 			s/'\''/'\''\'\'\''/g
diff --git a/git-format-patch.sh b/git-format-patch.sh
index daa3caea77..818059f242 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -173,6 +173,7 @@ titleScript='
 
 whosepatchScript='
 /^author /{
+	s/'\''/'\''\\'\'\''/g
 	s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
 	q
 }'