diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index 1ec696a4..ac4ffe71 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -17,6 +17,8 @@ copy_header_files () {
     mkdir -p "${artifacts_dir}/include" > /dev/null 2>&1
     pushd "${root_dir}"
     find libbitcoind -type f \( -name "*.h" -or -name "*.hpp" -or -name "*.ipp" \) -print0 | xargs -0 -I{} rsync -R {} "${artifacts_dir}"/include
+    mkdir -p "${artifacts_dir}/lib" > /dev/null 2>&1
+    cp -r "${h_and_a_dir}"/lib/libboost_filesystem-mt.a "${h_and_a_dir}"/lib/libboost_thread-mt.a "${artifacts_dir}"/lib/ 
     popd
   fi
 }
@@ -163,6 +165,9 @@ apply the current patch from "${root_dir}"/etc/bitcoin.patch? (y/N): "
     echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${artifacts_dir}"/patch_sha.txt
     echo "Copying the header files in order to be cached..."
     copy_header_files
+  else
+    echo "Could not find the shared libraries after they should have been built, please run make clean inside the libbitcoind dir and run npm install again."
+    exit 1
   fi
   echo 'Build finished successfully.'
 else
diff --git a/binding.gyp b/binding.gyp
index 61a90f6b..2fd9e15f 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -5,7 +5,7 @@
       '<!(node -e "require(\'nan\')")',
       '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src',
       '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/depends/<!(./platform/os.sh host)/include',
-      '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src/leveldb'
+      '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src/leveldb/include'
     ],
     'sources': [
       './src/bitcoindjs.cc',
@@ -27,8 +27,8 @@
     ],
     'link_settings': {
       'libraries': [
-        '<!(./platform/os.sh filesystem)',
-        '<!(./platform/os.sh thread)',
+        '<!(./platform/os.sh artifacts_dir)/lib/libboost_filesystem-mt.a',
+        '<!(./platform/os.sh artifacts_dir)/lib/libboost_thread-mt.a',
         '<!(./platform/os.sh lib)'
       ],
       'ldflags': [