  #include <stdio.h>
  #include <unistd.h>
 +#include <sodium.h>
- 
+
  #define DEFAULT_TUN_DEV "tun0"
- 
+
 @@ -532,6 +533,11 @@ int main(int argc, char** argv)
          fprintf(stderr, "Log_LEVEL = KEYS, EXPECT TO SEE PRIVATE KEYS IN YOUR LOGS!\n");
      #endif
- 
+
 +    if (sodium_init() == -1) {
 +        fprintf(stderr, "error in sodium_init\n");
 +        return 1;

         Bits_memcpy(buff.components.passwd, passwordHash, 32);
         crypto_hash_sha256(outputSecret, buff.bytes, 64);
     }
diff --git a/node_build/make.js b/node_build/make.js
index 2cecd10..f33c602 100644
--- a/node_build/make.js
+++ b/node_build/make.js
@@ -251,46 +251,9 @@ Builder.configure({
         }));
 
     }).nThen(function (waitFor) {
-
-        builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a');

+        builder.config.includeDirs.push('/tmp/libsodium/src/libsodium/include/');
+        builder.config.includeDirs.push('/tmp/libsodium/src/libsodium/include/sodium/');
     }).nThen(function (waitFor) {

         builder.config.libs.push(libuvLib);
@@ -429,7 +392,7 @@ Builder.configure({
     builder.buildExecutable('crypto/random/randombytes.c');

     builder.lintFiles(function (fileName, file, callback) {
-        if (/dependencies/.test(fileName)) {
+        if (/(dependencies|\/tmp\/libsodium)/.test(fileName)) {
