diff --git a/.gitmodules b/.gitmodules
index ba8cc39..8396558 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "deps/nanomsg"]
 	path = deps/nanomsg
-	url = https://github.com/nickdesaulniers/nanomsg.git
+	url = https://github.com/nanomsg/nanomsg.git
diff --git a/.travis.yml b/.travis.yml
index 932ab22..2d262bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,6 @@ language: node_js
 node_js:
   - "0.10"
   - "0.12"
-  - "iojs"
+  - "iojs-v2.5.0"
 before_install: make
 script: make check
diff --git a/binding.gyp b/binding.gyp
index 6399fa2..439dc9e 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -12,20 +12,19 @@
         ['OS=="mac"', {
             'includes': [
                 'macosx.gypi',
-            ]    
+            ]
         }],
         ['OS=="linux"', {
             'includes': [
                 'linux.gypi',
-            ]    
+            ]
         }],
         ['OS=="win"', {
             'includes': [
                 'win.gypi',
-            ]    
+            ]
         }],
       ],
-
       'include_dirs': [
         'deps/nanomsg/src',
         'deps/nanomsg/src/aio',
@@ -99,6 +98,7 @@
         'deps/nanomsg/src/protocols/utils/lb.c',
         'deps/nanomsg/src/protocols/utils/priolist.c',
         'deps/nanomsg/src/transports/utils/backoff.c',
+        'deps/nanomsg/src/transports/utils/base64.c',
         'deps/nanomsg/src/transports/utils/dns.c',
         'deps/nanomsg/src/transports/utils/iface.c',
         'deps/nanomsg/src/transports/utils/literal.c',
@@ -120,24 +120,36 @@
         'deps/nanomsg/src/transports/tcp/ctcp.c',
         'deps/nanomsg/src/transports/tcp/stcp.c',
         'deps/nanomsg/src/transports/tcp/tcp.c',
+        'deps/nanomsg/src/transports/tcpmux/atcpmux.c',
+        'deps/nanomsg/src/transports/tcpmux/btcpmux.c',
+        'deps/nanomsg/src/transports/tcpmux/ctcpmux.c',
+        'deps/nanomsg/src/transports/tcpmux/stcpmux.c',
+        'deps/nanomsg/src/transports/tcpmux/tcpmux.c',
+        'deps/nanomsg/src/transports/ws/aws.c',
+        'deps/nanomsg/src/transports/ws/bws.c',
+        'deps/nanomsg/src/transports/ws/cws.c',
+        'deps/nanomsg/src/transports/ws/sha1.c',
+        'deps/nanomsg/src/transports/ws/sws.c',
+        'deps/nanomsg/src/transports/ws/ws.c',
+        'deps/nanomsg/src/transports/ws/ws_handshake.c',
         'deps/nanomsg/src/devices/device.c',
       ],
     },
     {
       'target_name': 'node_nanomsg',
+      'dependencies': [ 'nanomsg', ],
       'cflags': [ '-Wall -Werror -Wno-unused' ],
       'cflags_cc': ['-fexceptions'],
       'conditions': [
         ['OS=="mac"', {
-          'ldflags': ['-ldtrace'],
-          'libraries': ['-ldtrace' ],
+          'ldflags': [ '-L<(PRODUCT_DIR) -ldtrace' ],
+          'libraries': [ '-ldtrace', '-L<(PRODUCT_DIR)' ],
         }],
         ['OS=="linux"', {
         }],
         ['OS=="win"', {
         }],
       ],
-      'dependencies': [ 'nanomsg', ],
       'include_dirs': [
         "<!(node -e \"require('nan')\")",
       ],
diff --git a/deps/nanomsg b/deps/nanomsg
index e046874..5515f96 160000
--- a/deps/nanomsg
+++ b/deps/nanomsg
@@ -1 +1 @@
-Subproject commit e046874531d937e94d0cde01910e2250a601bbc6
+Subproject commit 5515f964c3c5e01ca702ecb4d8ef0856d27a095c
diff --git a/linux.gypi b/linux.gypi
index cb71fbf..87e6cc6 100644
--- a/linux.gypi
+++ b/linux.gypi
@@ -6,6 +6,7 @@
         'NN_HAVE_PIPE',
         'NN_HAVE_POLL',
         'NN_USE_IFADDRS',
+        'NN_HAVE_MSG_CONTROL',
     ],
     'direct_dependent_settings': {
         # build nanomsg hub with same compiler flags as the library
@@ -15,6 +16,7 @@
             'NN_HAVE_PIPE',
             'NN_HAVE_POLL',
             'NN_USE_IFADDRS',
+            'NN_HAVE_MSG_CONTROL',
         ],
         'include_dirs': [
           'deps/nanomsg/src',
diff --git a/macosx.gypi b/macosx.gypi
index 6eb7751..8ccf988 100644
--- a/macosx.gypi
+++ b/macosx.gypi
@@ -3,23 +3,30 @@
     'defines': [
         'NN_HAVE_CLANG',
         'NN_HAVE_OSX',
-        'NN_USE_KQUEUE',
         'NN_HAVE_PIPE',
         'NN_HAVE_POLL',
+        'NN_USE_KQUEUE',
         'NN_USE_IFADDRS',
+        'NN_USE_EVENTFD',
+        'NN_HAVE_MSG_CONTROL',
     ],
     'direct_dependent_settings': {
         # build nanomsg hub with same compiler flags as the library
         'defines': [
             'NN_HAVE_CLANG',
             'NN_HAVE_OSX',
-            'NN_USE_KQUEUE',
             'NN_HAVE_PIPE',
             'NN_HAVE_POLL',
+            'NN_USE_KQUEUE',
             'NN_USE_IFADDRS',
+            'NN_USE_EVENTFD',
+            'NN_HAVE_MSG_CONTROL'
         ],
         'include_dirs': [
           'deps/nanomsg/src',
         ],
+        'cflags': [
+          '-Wall -Werror -Wno-unused -g -O2 -D_THREAD_SAFE'
+        ],
     }
 }
diff --git a/src/node_nanomsg.cc b/src/node_nanomsg.cc
index bccfc94..f4bfc74 100644
--- a/src/node_nanomsg.cc
+++ b/src/node_nanomsg.cc
@@ -12,6 +12,8 @@
 #include <inproc.h>
 #include <ipc.h>
 #include <tcp.h>
+#include <tcpmux.h>
+#include <ws.h>
 
 using v8::Array;
 using v8::Function;
diff --git a/test/symbol.js b/test/symbol.js
index cb92db4..ae075e2 100644
--- a/test/symbol.js
+++ b/test/symbol.js
@@ -33,4 +33,3 @@ test('retrieve symbol name/value', function (t) {
     }
     t.end();
 });
-
diff --git a/test/symbols.js b/test/symbols.js
index 1f718ca..7da72f0 100644
--- a/test/symbols.js
+++ b/test/symbols.js
@@ -106,6 +106,14 @@ exports.symbols = [
                 'type':  nn.NN_TYPE_NONE,
                 'unit':  nn.NN_UNIT_NONE
 
+},
+{
+                'value': nn.NN_NS_EVENT,
+                'name':  "NN_NS_EVENT",
+                'ns':    nn.NN_NS_NAMESPACE,
+                'type':  nn.NN_TYPE_NONE,
+                'unit':  nn.NN_UNIT_NONE
+
 },
 {
                 'value': nn.NN_TYPE_NONE,
@@ -498,6 +506,22 @@ exports.symbols = [
                 'type':  nn.NN_TYPE_NONE,
                 'unit':  nn.NN_UNIT_NONE
 
+},
+{
+                'value': nn.NN_POLLIN,
+                'name':  "NN_POLLIN",
+                'ns':    13,
+                'type':  nn.NN_TYPE_NONE,
+                'unit':  nn.NN_UNIT_NONE
+
+},
+{
+                'value': nn.NN_POLLOUT,
+                'name':  "NN_POLLOUT",
+                'ns':    13,
+                'type':  nn.NN_TYPE_NONE,
+                'unit':  nn.NN_UNIT_NONE
+
 },
 {
                 'value': nn.EADDRINUSE,
diff --git a/win.gypi b/win.gypi
index 552a8a7..24fb649 100644
--- a/win.gypi
+++ b/win.gypi
@@ -7,6 +7,7 @@
         'WIN32',
         'NN_USE_LITERAL_IFADDR',
         'NN_EXPORTS',
+        'NN_HAVE_STDINT',
     ],
     'link_settings': {
         'libraries': [
@@ -23,6 +24,7 @@
             'WIN32',
             'NN_USE_LITERAL_IFADDR',
             'NN_EXPORTS',
+            'NN_HAVE_STDINT',
         ],
         'include_dirs': [
           'deps/nanomsg/src',