diff --git a/Sparkles/Git/GitRepository.cs b/Sparkles/Git/GitRepository.cs
index 3bbef883..b18969a0 100644
--- a/Sparkles/Git/GitRepository.cs
+++ b/Sparkles/Git/GitRepository.cs
@@ -568,7 +568,9 @@ namespace Sparkles.Git {
 
             Add ();
 
-            var git = new GitCommand (LocalPath, "commit --message \"Conflict resolution by SparkleShare\"");
+            var git = new GitCommand (LocalPath,
+                "commit --message=\"Conflict resolution\" --author=\"SparkleShare <info@sparkleshare.org>\"");
+
             git.StartInfo.RedirectStandardOutput = false;
             git.StartAndWaitForExit ();