diff --git a/README.md b/README.md
index 8f5703f..1c22181 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@ $ npm install default-user-agent
 var ua = require('default-user-agent');
 
 // darwin
-console.log(ua()); // 'node/v0.11.11 (darwin 13.1.0; x64)'
-console.log(ua('urllib', '0.0.1')); // 'urllib/0.0.1 node/v0.11.11 (darwin 13.1.0; x64)'
+console.log(ua()); // 'Node.js/0.11.15 (OS X Yosemite; x64)'
+console.log(ua('urllib', '0.0.1')); // 'urllib/0.0.1 Node.js/0.11.15 (OS X Yosemite; x64)'
 
 // linux
-// 'node/v0.11.11 (linux 3.11.0-12-generic; x64)'
+// 'Node.js/0.11.15 (Linux 3.13; x64)'
 ```
 
 ## License
diff --git a/index.js b/index.js
index 53b3d20..b9221cc 100644
--- a/index.js
+++ b/index.js
@@ -14,11 +14,10 @@
  * Module dependencies.
  */
 
-var os = require('os');
+var osName = require('os-name');
 
-var USER_AGENT = 'node/' + process.version
-  + ' (' + process.platform + ' ' + os.release()
-  + '; ' + process.arch + ')';
+var USER_AGENT = 'Node.js/' + process.version.slice(1)
+  + ' (' + osName() + '; ' + process.arch + ')';
 
 module.exports = function ua(name, version) {
   if (arguments.length !== 2) {
diff --git a/package.json b/package.json
index e3b6896..b1edd75 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     }
   },
   "dependencies": {
-
+    "os-name": "*"
   },
   "devDependencies": {
     "autod": "*",
diff --git a/test/default-user-agent.test.js b/test/default-user-agent.test.js
index 114cf57..1ac88e0 100644
--- a/test/default-user-agent.test.js
+++ b/test/default-user-agent.test.js
@@ -22,15 +22,15 @@ describe('default-user-agent.test.js', function () {
     var s = ua();
     s.should.be.a.String;
     s.should.match(/\w+\/\w+/);
-    // 'node/v0.11.11 (darwin 13.1.0; x64)'
-    s.should.match(/^node\/v\d\.\d+\.\d+ \(\w+ .+; \w+\)$/);
+    // 'Node.js/0.11.15 (OS X Yosemite; x64)'
+    s.should.match(/^Node\.js\/\d\.\d+\.\d+ \(\w+ .+; \w+\)$/);
   });
 
   it('should got custom user agent string', function () {
     var s = ua('urllib', '0.1.1');
     s.should.be.a.String;
     s.should.match(/\w+\/\w+/);
-    // 'node/v0.11.11 (darwin 13.1.0; x64)'
-    s.should.match(/^urllib\/0\.1\.1 node\/v\d\.\d+\.\d+ \(\w+ .+; \w+\)$/);
+    // 'Node.js/0.11.15 (OS X Yosemite; x64)'
+    s.should.match(/^urllib\/0\.1\.1 Node\.js\/\d\.\d+\.\d+ \(\w+ .+; \w+\)$/);
   });
 });