diff --git a/lib/remote.js b/lib/remote.js
index d3ea166..653c44d 100644
--- a/lib/remote.js
+++ b/lib/remote.js
@@ -5,6 +5,7 @@ var WebSocket = require('ws');
 var PromiseA = require('bluebird');
 var sni = require('sni');
 var Packer = require('proxy-packer');
+var os = require('os');
 
 function timeoutPromise(duration) {
   return new PromiseA(function (resolve) {
@@ -495,6 +496,12 @@ function _connect(state) {
         , subject_scheme: 'mailto'
           // TODO create domains list earlier
         , scope: Object.keys(state.config.servernames || {}).join(',')
+        , hostname: os.hostname()
+          // Used for User-Agent
+        , os_type: os.type()
+        , os_platform: os.platform()
+        , os_release: os.release()
+        , os_arch: os.arch()
         };
       }
     }