diff --git a/SparkleShare/sparkleshare.in b/SparkleShare/sparkleshare.in
index 6352c66d..88302a5c 100644
--- a/SparkleShare/sparkleshare.in
+++ b/SparkleShare/sparkleshare.in
@@ -19,7 +19,11 @@ start() {
   fi
 
   echo -n "Starting SparkleShare... "
-  ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  if [ -n "${SSH_AGENT_PID}" -o -n "${SSH_AUTH_SOCK}" ] ; then
+    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  else
+    ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
+  fi
   ( umask 066; echo $! > ${pidfile} )
   echo "Done."
 }