Index: lib/gtls.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/gtls.c,v
retrieving revision 1.31
diff -u -r1.31 gtls.c
--- lib/gtls.c	1 Aug 2007 21:20:01 -0000	1.31
+++ lib/gtls.c	23 Aug 2007 16:04:11 -0000
@@ -691,7 +691,7 @@
 
 size_t Curl_gtls_version(char *buffer, size_t size)
 {
-  return snprintf(buffer, size, " GnuTLS/%s", gnutls_check_version(NULL));
+  return snprintf(buffer, size, "GnuTLS/%s", gnutls_check_version(NULL));
 }
 
 #endif /* USE_GNUTLS */
Index: lib/nss.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/nss.c,v
retrieving revision 1.8
diff -u -r1.8 nss.c
--- lib/nss.c	1 Aug 2007 21:20:01 -0000	1.8
+++ lib/nss.c	23 Aug 2007 16:03:07 -0000
@@ -601,6 +601,6 @@
 
 size_t Curl_nss_version(char *buffer, size_t size)
 {
-  return snprintf(buffer, size, " NSS/%s", NSS_VERSION);
+  return snprintf(buffer, size, "NSS/%s", NSS_VERSION);
 }
 #endif /* USE_NSS */
Index: lib/ssluse.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/ssluse.c,v
retrieving revision 1.181
diff -u -r1.181 ssluse.c
--- lib/ssluse.c	7 Aug 2007 12:44:41 -0000	1.181
+++ lib/ssluse.c	23 Aug 2007 16:03:53 -0000
@@ -1898,7 +1898,7 @@
 #ifdef YASSL_VERSION
   /* yassl provides an OpenSSL API compatiblity layer so it looks identical
      to OpenSSL in all other aspects */
-  return snprintf(buffer, size, " yassl/%s", YASSL_VERSION);
+  return snprintf(buffer, size, "yassl/%s", YASSL_VERSION);
 #else /* YASSL_VERSION */
 
 #if (SSLEAY_VERSION_NUMBER >= 0x905000)
@@ -1919,7 +1919,7 @@
         sub[0]='\0';
     }
 
-    return snprintf(buffer, size, " OpenSSL/%lx.%lx.%lx%s",
+    return snprintf(buffer, size, "OpenSSL/%lx.%lx.%lx%s",
                     (ssleay_value>>28)&0xf,
                     (ssleay_value>>20)&0xff,
                     (ssleay_value>>12)&0xff,
@@ -1929,7 +1929,7 @@
 #else /* SSLEAY_VERSION_NUMBER is less than 0.9.5 */
 
 #if (SSLEAY_VERSION_NUMBER >= 0x900000)
-  return snprintf(buffer, size, " OpenSSL/%lx.%lx.%lx",
+  return snprintf(buffer, size, "OpenSSL/%lx.%lx.%lx",
                   (SSLEAY_VERSION_NUMBER>>28)&0xff,
                   (SSLEAY_VERSION_NUMBER>>20)&0xff,
                   (SSLEAY_VERSION_NUMBER>>12)&0xf);
@@ -1944,7 +1944,7 @@
     else
       sub[0]='\0';
 
-    return snprintf(buffer, size, " SSL/%x.%x.%x%s",
+    return snprintf(buffer, size, "SSL/%x.%x.%x%s",
                     (SSLEAY_VERSION_NUMBER>>12)&0xff,
                     (SSLEAY_VERSION_NUMBER>>8)&0xf,
                     (SSLEAY_VERSION_NUMBER>>4)&0xf, sub);
Index: lib/version.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/version.c,v
retrieving revision 1.54
diff -u -r1.54 version.c
--- lib/version.c	16 Aug 2007 14:08:47 -0000	1.54
+++ lib/version.c	23 Aug 2007 16:07:29 -0000
@@ -61,9 +61,15 @@
   left -= len;
   ptr += len;
 
-  len = Curl_ssl_version(ptr, left);
-  left -= len;
-  ptr += len;
+  if (left > 1) {
+    len = Curl_ssl_version(ptr + 1, left - 1);
+
+    if (len > 0) {
+      *ptr = ' ';
+      left -= ++len;
+      ptr += len;
+    }
+  }
 
 #ifdef HAVE_LIBZ
   len = snprintf(ptr, left, " zlib/%s", zlibVersion());