diff --git a/lib/http_server.js b/lib/http_server.js
index 17d53d9..9316d2f 100644
--- a/lib/http_server.js
+++ b/lib/http_server.js
@@ -40,6 +40,7 @@ var ZettaHttpServer = module.exports = function(zettaInstance, options) {
   this.eventBroker = new EventBroker(zettaInstance);
   this.clients = {};
   this.peers = {}; // connected peers
+  this.peerOptions = {}; // default empty options for PeerSocket
 
   this._deviceQueries = [];
 
@@ -301,7 +302,7 @@ ZettaHttpServer.prototype.setupPeerSocket = function(ws) {
     // peer has been disconnected but has connected before.
     self.peers[name].init(ws);
   } else {
-    var peer = new PeerSocket(ws, name, self.peerRegistry);
+    var peer = new PeerSocket(ws, name, self.peerRegistry, self.peerOptions);
     self.peers[name] = peer;
 
     // Events coming from the peers pubsub using push streams
diff --git a/lib/peer_socket.js b/lib/peer_socket.js
index 9f701ad..28a0981 100644
--- a/lib/peer_socket.js
+++ b/lib/peer_socket.js
@@ -14,9 +14,13 @@ var STATES = {
   'CONNECTED': 2
 };
 
-var PeerSocket = module.exports = function(ws, name, peerRegistry) {
+var PeerSocket = module.exports = function(ws, name, peerRegistry, opts) {
   EventEmitter.call(this);
 
+  if (!opts) {
+    opts = {};
+  }
+  
   var self = this;
   this.state = STATES.DISCONNECTED;
   this.name = name; // peers local id
@@ -24,7 +28,8 @@ var PeerSocket = module.exports = function(ws, name, peerRegistry) {
   this.subscriptions = {}; // { <topic>: <subscribed_count> }
   this.connectionId = null;
   this._pingTimer = null;
-  this._pingTimeout = 10 * 1000;
+  this._pingTimeout = Number(opts.pingTimeout) || (10 * 1000);
+  this._confirmationTimeout = Number(opts.confirmationTimeout) || 10 * 1000;
   this.peerRegistry = peerRegistry;
   this.logger = new Logger();
 
@@ -360,7 +365,7 @@ PeerSocket.prototype.confirmConnection = function(connectionId, callback) {
   var timeout = setTimeout(function() {
     req.abort();
     callback(new Error('Confirm connection timeout reached.'));
-  }, this._pingTimeout);
+  }, this._confirmationTimeout);
   
   var opts = { agent: this.agent, path: '/_initiate_peer/' + connectionId };
   var req = http.get(opts, function(res) {
diff --git a/test/test_zetta.js b/test/test_zetta.js
index f44ed4f..583cfe5 100644
--- a/test/test_zetta.js
+++ b/test/test_zetta.js
@@ -373,6 +373,29 @@ describe('Zetta', function() {
       });
     });
 
+    it('peerOptions in httpServer should update options in PeerSockets', function(done) {
+      var z = zetta({ registry: new MemRegistry(), peerRegistry: new MemPeerRegistry() });
+      z.silent();
+      z.use(function(server) {
+        server.httpServer.peerOptions = {
+          pingTimeout: 4321,
+          confirmationTimeout: 1234
+        };
+        server.pubsub.subscribe('_peer/connect', function(topic, data) {
+          assert.equal(data.peer._pingTimeout, 4321);
+          assert.equal(data.peer._confirmationTimeout, 1234);
+          done();
+        })
+      })
+      z.listen(0, function() {
+        var port = z.httpServer.server.address().port;
+        zetta({ registry: new MemRegistry(), peerRegistry: new MemPeerRegistry() })
+          .silent()
+          .link('http://localhost:' + port)
+          .listen(0);
+      })
+    })
+
     it('.link should not add to peers', function(done){
 
       peerRegistry.db.put('1234567', JSON.stringify({id: '1234567', direction: 'initiator', url: 'http://example.com/', fromLink: true}), function(err){