diff --git a/lib/PayPal/Common/PayPalUserAgent.php b/lib/PayPal/Common/PayPalUserAgent.php
index d6adc47..d072b2f 100644
--- a/lib/PayPal/Common/PayPalUserAgent.php
+++ b/lib/PayPal/Common/PayPalUserAgent.php
@@ -23,21 +23,20 @@ class PayPalUserAgent
     {
 
         $featureList = array(
-            'lang=PHP',
-            'v=' . PHP_VERSION,
+            'platform-ver=' . PHP_VERSION,
             'bit=' . self::_getPHPBit(),
             'os=' . str_replace(' ', '_', php_uname('s') . ' ' . php_uname('r')),
             'machine=' . php_uname('m')
         );
         if (defined('OPENSSL_VERSION_TEXT')) {
             $opensslVersion = explode(' ', OPENSSL_VERSION_TEXT);
-            $featureList[] = 'openssl=' . $opensslVersion[1];
+            $featureList[] = 'crypto-lib-ver=' . $opensslVersion[1];
         }
         if (function_exists('curl_version')) {
             $curlVersion = curl_version();
             $featureList[] = 'curl=' . $curlVersion['version'];
         }
-        return sprintf("PayPalSDK/%s %s (%s)", $sdkName, $sdkVersion, implode(';', $featureList));
+        return sprintf("PayPalSDK/%s %s (%s)", $sdkName, $sdkVersion, implode('; ', $featureList));
     }
 
     /**
diff --git a/tests/PayPal/Test/Common/UserAgentTest.php b/tests/PayPal/Test/Common/UserAgentTest.php
index a9f6566..116561b 100644
--- a/tests/PayPal/Test/Common/UserAgentTest.php
+++ b/tests/PayPal/Test/Common/UserAgentTest.php
@@ -8,7 +8,7 @@ class UserAgentTest extends PHPUnit_Framework_TestCase
     public function testGetValue()
     {
         $ua = PayPalUserAgent::getValue("name", "version");
-        list($id, $version, $features) = sscanf($ua, "PayPalSDK/%s %s (%s)");
+        list($id, $version, $features) = sscanf($ua, "PayPalSDK/%s %s (%[^[]])");
 
         // Check that we pass the useragent in the expected format
         $this->assertNotNull($id);
@@ -19,10 +19,9 @@ class UserAgentTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("version", $version);
 
         // Check that we pass in these mininal features
-        $this->assertThat($features, $this->stringContains("OS="));
-        $this->assertThat($features, $this->stringContains("Bit="));
-        $this->assertThat($features, $this->stringContains("Lang="));
-        $this->assertThat($features, $this->stringContains("V="));
+        $this->assertThat($features, $this->stringContains("os="));
+        $this->assertThat($features, $this->stringContains("bit="));
+        $this->assertThat($features, $this->stringContains("platform-ver="));
         $this->assertGreaterThan(5, count(explode(';', $features)));
     }
 }