diff --git a/ssh.py b/ssh.py
index 1d7ebe3..bb89fa1 100644
--- a/ssh.py
+++ b/ssh.py
@@ -42,7 +42,7 @@
     """parse a ssh version string into a tuple"""
     if ver_str is None:
         ver_str = _run_ssh_version()
-    m = re.match(r"^OpenSSH_([0-9.]+)(p[0-9]+)?\s", ver_str)
+    m = re.match(r"^OpenSSH_([0-9.]+)(p[0-9]+)?[\s,]", ver_str)
     if m:
         return tuple(int(x) for x in m.group(1).split("."))
     else: